diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cd03eb4..f89f319 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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") + } + + } diff --git a/app/google-services.json b/app/google-services.json index 0679dbe..e8ab899 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -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": { diff --git a/app/libs/SparkChain.aar b/app/libs/SparkChain.aar deleted file mode 100644 index e058a2b..0000000 Binary files a/app/libs/SparkChain.aar and /dev/null differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 702de19..4e5b3b6 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -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.** @@ -195,4 +195,10 @@ -dontwarn com.netease.yunxin.kit.** -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 {*;} \ No newline at end of file +-keep class * implements com.netease.yunxin.kit.corekit.XKitService {*;} + +-keep class com.qiniu.**{*;} +-keep class com.qiniu.**{public ();} +-ignorewarnings + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5ba5bf..feadf90 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto"> - + @@ -13,23 +13,24 @@ android:required="false" /> - - + + + - + - + - + @@ -90,8 +91,9 @@ - - + + @@ -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"> @@ -157,7 +159,7 @@ @@ -169,7 +171,7 @@ @@ -229,7 +231,7 @@ - + android:screenOrientation="portrait" />--> + + + - - + + + - android:name=".wxapi.WXPayEntryActivity" - android:exported="true" /> + + @@ -834,7 +842,7 @@ + android:resource="@mipmap/ic_launche" /> @@ -910,9 +918,9 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + android:grantUriPermissions="true"> + + \ No newline at end of file diff --git a/app/src/main/ic_launche-playstore.png b/app/src/main/ic_launche-playstore.png new file mode 100644 index 0000000..07007b5 Binary files /dev/null and b/app/src/main/ic_launche-playstore.png differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png deleted file mode 100644 index a812c05..0000000 Binary files a/app/src/main/ic_launcher-playstore.png and /dev/null differ diff --git a/app/src/main/java/com/dskj/rbchat/jpush/PushMessageReceiver.java b/app/src/main/java/com/dskj/rbchat/jpush/PushMessageReceiver.java deleted file mode 100644 index 6ef09df..0000000 --- a/app/src/main/java/com/dskj/rbchat/jpush/PushMessageReceiver.java +++ /dev/null @@ -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() { - - } -} diff --git a/app/src/main/java/com/dskj/rbchat/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/dskj/rbchat/jpush/TagAliasOperatorHelper.java deleted file mode 100644 index 057e8bc..0000000 --- a/app/src/main/java/com/dskj/rbchat/jpush/TagAliasOperatorHelper.java +++ /dev/null @@ -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 setActionCache = new SparseArray(); - - 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 tags; - String alias; - boolean isAliasAction; - - @Override - public String toString() { - return "TagAliasBean{" + - "action=" + action + - ", tags=" + tags + - ", alias='" + alias + '\'' + - ", isAliasAction=" + isAliasAction + - '}'; - } - } - - -} diff --git a/app/src/main/java/com/dskj/rbchat/login/RegisterActivityBf.java b/app/src/main/java/com/dskj/rbchat/login/RegisterActivityBf.java deleted file mode 100644 index e0feaf1..0000000 --- a/app/src/main/java/com/dskj/rbchat/login/RegisterActivityBf.java +++ /dev/null @@ -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 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 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 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>() { - - @Override - public void onSuccess(Result 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 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>() { - - @Override - public void onSuccess(Result 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 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 feedbackResp) { - doLogin(); - } - - @Override - public void onError(int code, String msg) { - LogUtils.i("获取到的错误:" + code + "" + msg); - ToastX.showShortToast(msg); - } - }); - - - } - - /** - * 实施登录的方法. - *

- * 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理. - * - */ - 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 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>() { -// -// @Override -// public void onSuccess(Result feedbackResp) { -// avaterBean = feedbackResp.data; -// } -// -// @Override -// public void onError(int code, String msg) { -// } -// }); -// } - - - private void toStep2() { - hideSoftInput(RegisterActivityBf.this); - Map 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>() { - - @Override - public void onSuccess(Result 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 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 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 call) { - Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget() { - @Override - public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition 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() { - @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>() { - @Override - public void onSuccess(Result 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); - } - -} diff --git a/app/src/main/java/com/dskj/rbchat/main/CustomCallOrderHelper.java b/app/src/main/java/com/dskj/rbchat/main/CustomCallOrderHelper.java deleted file mode 100644 index e6ab59b..0000000 --- a/app/src/main/java/com/dskj/rbchat/main/CustomCallOrderHelper.java +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) 2022 NetEase, Inc. All rights reserved. -// Use of this source code is governed by a MIT license that can be -// found in the LICENSE file. - -package com.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 durations, - int callType) { - ALog.dApi( - TAG, - new ParameterMap("sendOrder") - .append("status", status) - .append("channelType", channelType) - .append("callType", callType) - .append("durations", durations) - .append("accountId", accountId) - .toValue()); - if (callType == CallParams.CallType.P2P) { - NetCallAttachment netCallAttachment = - new NetCallAttachment.NetCallAttachmentBuilder() - .withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue()) - .withStatus(status) - .withDurations(durations) - .build(); - IMMessage message = - MessageBuilder.createNrtcNetcallMessage( - accountId, SessionTypeEnum.P2P, netCallAttachment); - ChatRepo.sendMessage(message, true, null); - } - } -} diff --git a/app/src/main/java/com/dskj/rbchat/main/index/AiChatActivity.java b/app/src/main/java/com/dskj/rbchat/main/index/AiChatActivity.java deleted file mode 100644 index b9c9dc4..0000000 --- a/app/src/main/java/com/dskj/rbchat/main/index/AiChatActivity.java +++ /dev/null @@ -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 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(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 = 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 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(); -// } - - -} - - - - - diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNewActivity.java b/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNewActivity.java deleted file mode 100644 index 7f4412c..0000000 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNewActivity.java +++ /dev/null @@ -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)); - } -} diff --git a/app/src/main/java/com/dskj/rbchat/wxapi/WXEntryActivity.java b/app/src/main/java/com/dskj/rbchat/wxapi/WXEntryActivity.java deleted file mode 100644 index e6f8dad..0000000 --- a/app/src/main/java/com/dskj/rbchat/wxapi/WXEntryActivity.java +++ /dev/null @@ -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(); - } - -} diff --git a/app/src/main/java/com/dskj/rbchat/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/dskj/rbchat/wxapi/WXPayEntryActivity.java deleted file mode 100644 index 2454f48..0000000 --- a/app/src/main/java/com/dskj/rbchat/wxapi/WXPayEntryActivity.java +++ /dev/null @@ -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(); - } - - - - -} diff --git a/app/src/main/java/com/dskj/rbchat/AppSkinConfig.java b/app/src/main/java/com/hbl/lewan/AppSkinConfig.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/AppSkinConfig.java rename to app/src/main/java/com/hbl/lewan/AppSkinConfig.java index 4fc434d..a62618e 100644 --- a/app/src/main/java/com/dskj/rbchat/AppSkinConfig.java +++ b/app/src/main/java/com/hbl/lewan/AppSkinConfig.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. - package com.dskj.rbchat; + package com.hbl.lewan; import com.netease.yunxin.kit.corekit.im.utils.PreferenceUtils; diff --git a/app/src/main/java/com/dskj/rbchat/CustomConfig.java b/app/src/main/java/com/hbl/lewan/CustomConfig.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/CustomConfig.java rename to app/src/main/java/com/hbl/lewan/CustomConfig.java index 78f8062..cfdbad1 100644 --- a/app/src/main/java/com/dskj/rbchat/CustomConfig.java +++ b/app/src/main/java/com/hbl/lewan/CustomConfig.java @@ -2,11 +2,11 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/IMApplication.java b/app/src/main/java/com/hbl/lewan/IMApplication.java similarity index 82% rename from app/src/main/java/com/dskj/rbchat/IMApplication.java rename to app/src/main/java/com/hbl/lewan/IMApplication.java index 44809a6..d657df5 100644 --- a/app/src/main/java/com/dskj/rbchat/IMApplication.java +++ b/app/src/main/java/com/hbl/lewan/IMApplication.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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(); } diff --git a/app/src/main/java/com/dskj/rbchat/IMUIKitConfig.java b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java similarity index 63% rename from app/src/main/java/com/dskj/rbchat/IMUIKitConfig.java rename to app/src/main/java/com/hbl/lewan/IMUIKitConfig.java index 4a5337f..cfe5dab 100644 --- a/app/src/main/java/com/dskj/rbchat/IMUIKitConfig.java +++ b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java @@ -1,7 +1,7 @@ // Copyright (c) 2022 NetEase, Inc. All rights reserved. // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 diff --git a/app/src/main/java/com/dskj/rbchat/NimSDKOptionConfig.java b/app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/NimSDKOptionConfig.java rename to app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java index 2724412..271f7c4 100644 --- a/app/src/main/java/com/dskj/rbchat/NimSDKOptionConfig.java +++ b/app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/NotificationMsgService.java b/app/src/main/java/com/hbl/lewan/NotificationMsgService.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/NotificationMsgService.java rename to app/src/main/java/com/hbl/lewan/NotificationMsgService.java index 7b2170a..bc9c8a4 100644 --- a/app/src/main/java/com/dskj/rbchat/NotificationMsgService.java +++ b/app/src/main/java/com/hbl/lewan/NotificationMsgService.java @@ -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) diff --git a/app/src/main/java/com/dskj/rbchat/about/AboutActivity.java b/app/src/main/java/com/hbl/lewan/about/AboutActivity.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/about/AboutActivity.java rename to app/src/main/java/com/hbl/lewan/about/AboutActivity.java index 8f6a4d3..373fd60 100644 --- a/app/src/main/java/com/dskj/rbchat/about/AboutActivity.java +++ b/app/src/main/java/com/hbl/lewan/about/AboutActivity.java @@ -2,16 +2,16 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 { diff --git a/app/src/main/java/com/dskj/rbchat/adapter/CommonAdapter.java b/app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/adapter/CommonAdapter.java rename to app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java index 7b2e427..d8857b7 100644 --- a/app/src/main/java/com/dskj/rbchat/adapter/CommonAdapter.java +++ b/app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/adapter/ViewHolder.java b/app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/adapter/ViewHolder.java rename to app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java index f6d13b7..679ef48 100644 --- a/app/src/main/java/com/dskj/rbchat/adapter/ViewHolder.java +++ b/app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.adapter; +package com.hbl.lewan.adapter; import android.content.Context; import android.util.SparseArray; diff --git a/app/src/main/java/com/dskj/rbchat/base/LllChatBaseActivity.java b/app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/base/LllChatBaseActivity.java rename to app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java index 524ddb3..02ffacc 100644 --- a/app/src/main/java/com/dskj/rbchat/base/LllChatBaseActivity.java +++ b/app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java @@ -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 { diff --git a/app/src/main/java/com/dskj/rbchat/contact/ContactGroupSettingActivity.java b/app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/contact/ContactGroupSettingActivity.java rename to app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java index 7ff16ef..6a74da5 100644 --- a/app/src/main/java/com/dskj/rbchat/contact/ContactGroupSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/contact/FunBlackListActivity.java b/app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/contact/FunBlackListActivity.java rename to app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java index 764b10c..9648027 100644 --- a/app/src/main/java/com/dskj/rbchat/contact/FunBlackListActivity.java +++ b/app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.dskj.rbchat.contact; +package com.hbl.lewan.contact; import android.graphics.Typeface; import android.os.Bundle; diff --git a/app/src/main/java/com/dskj/rbchat/contact/ReportActivity.java b/app/src/main/java/com/hbl/lewan/contact/ReportActivity.java similarity index 77% rename from app/src/main/java/com/dskj/rbchat/contact/ReportActivity.java rename to app/src/main/java/com/hbl/lewan/contact/ReportActivity.java index 7bf61f8..acf4315 100644 --- a/app/src/main/java/com/dskj/rbchat/contact/ReportActivity.java +++ b/app/src/main/java/com/hbl/lewan/contact/ReportActivity.java @@ -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 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 feedbackResp) { + public void onSuccess(Result feedbackResp) { stsCredentialsBean = feedbackResp.data; - toAliYunOss(); +// toAliYunOss(file, isHead); + toUpdateOssNew(0); + } @Override @@ -275,82 +300,151 @@ 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 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) { + private void toUpdateOssNew( int i) { 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)+""; + 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() + "_" + file.getName(); - // 构造上传请求。 - PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName + ".png", localMedias.get(i).getRealPath()); + String fileName = UUID.randomUUID().toString() + "_" + file.getName(); + LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); + String files = "media/" + updatePathPic + "/" + 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)+"%"); -// } - }); - - //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"); + 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)); } - - @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()); - } - } - }); + }, 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 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) { diff --git a/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java b/app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java rename to app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java index 41201b9..c7137f7 100644 --- a/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java @@ -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(); diff --git a/app/src/main/java/com/dskj/rbchat/custom/ChatStickerViewHolder.java b/app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/custom/ChatStickerViewHolder.java rename to app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java index ab93b98..bc7d88f 100644 --- a/app/src/main/java/com/dskj/rbchat/custom/ChatStickerViewHolder.java +++ b/app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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) diff --git a/app/src/main/java/com/dskj/rbchat/custom/CustomDatePickerNew.java b/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/custom/CustomDatePickerNew.java rename to app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java index 19ecc7d..ed88770 100644 --- a/app/src/main/java/com/dskj/rbchat/custom/CustomDatePickerNew.java +++ b/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/custom/PasswordEditText.java b/app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/custom/PasswordEditText.java rename to app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java index 227a519..8238184 100644 --- a/app/src/main/java/com/dskj/rbchat/custom/PasswordEditText.java +++ b/app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog.java b/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java index a548954..6e4b40a 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java @@ -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; /** * 通用弹窗 diff --git a/app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog1.java b/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog1.java rename to app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java index cfb9715..ca6acdc 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/ActionConfirmDialog1.java +++ b/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java @@ -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; /** * 通用弹窗 diff --git a/app/src/main/java/com/dskj/rbchat/dialog/ActionInputConfirmDialog.java b/app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/dialog/ActionInputConfirmDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java index 97443ec..32873cd 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/ActionInputConfirmDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/MianMiDialog.java b/app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/dialog/MianMiDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java index 51760c3..54dc883 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/MianMiDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java @@ -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; /** diff --git a/app/src/main/java/com/dskj/rbchat/dialog/MianMiXieyiDialog.java b/app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/dialog/MianMiXieyiDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java index a79c77b..2149da3 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/MianMiXieyiDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java @@ -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; /** diff --git a/app/src/main/java/com/dskj/rbchat/dialog/PayCashDialog.java b/app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/dialog/PayCashDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java index bf92cac..04d765f 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/PayCashDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/PayCashFingerDialog.java b/app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/dialog/PayCashFingerDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java index 2f36261..ee9580a 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/PayCashFingerDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/PayDialog.java b/app/src/main/java/com/hbl/lewan/dialog/PayDialog.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/dialog/PayDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/PayDialog.java index b15407e..0af89e1 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/PayDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/PayDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectCountryDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectCountryDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java index 2366bc1..37d13d6 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectCountryDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectLanguageDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectLanguageDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java index af31654..da55327 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectLanguageDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectPayTypeDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectPayTypeDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java index 7a6b131..b4a5564 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectPayTypeDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java @@ -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 { diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectPhotoTypeDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectPhotoTypeDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java index 952c794..8d5fa3e 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectPhotoTypeDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectPhotosMoveDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectPhotosMoveDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java index b77e6af..62b3ba5 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectPhotosMoveDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectPushTypeDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectPushTypeDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java index 1fff7d2..d13f9c2 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectPushTypeDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java @@ -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 { diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectSexDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectSexDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java index 7be0a70..07bd9fa 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectSexDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/SelectTypeDialog.java b/app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/dialog/SelectTypeDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java index 6bf1c52..eeadb77 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/SelectTypeDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/dialog/VersionDialog.java b/app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/dialog/VersionDialog.java rename to app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java index e470632..8a59b7b 100644 --- a/app/src/main/java/com/dskj/rbchat/dialog/VersionDialog.java +++ b/app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java @@ -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; /** * 版本弹窗 diff --git a/app/src/main/java/com/dskj/rbchat/event/ConversationEditEvent.java b/app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/event/ConversationEditEvent.java rename to app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java index 776a4ad..745447e 100644 --- a/app/src/main/java/com/dskj/rbchat/event/ConversationEditEvent.java +++ b/app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.event; +package com.hbl.lewan.event; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dskj/rbchat/event/UserAlbumsUpdateEvent.java b/app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/event/UserAlbumsUpdateEvent.java rename to app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java index 116bd07..c841a21 100644 --- a/app/src/main/java/com/dskj/rbchat/event/UserAlbumsUpdateEvent.java +++ b/app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.event; +package com.hbl.lewan.event; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dskj/rbchat/game/JsBridgeActivity.java b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/game/JsBridgeActivity.java rename to app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java index 45acec9..5e58cef 100644 --- a/app/src/main/java/com/dskj/rbchat/game/JsBridgeActivity.java +++ b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java @@ -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 permissionsGranted) { - toLocation(); - permissionExplainDialog.dismiss(); - } - - @Override - public void onDenial( - List permissionsDenial, List permissionDenialForever) { - permissionExplainDialog.dismiss(); - Map 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 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 permissionsGranted) { +// toLocation(); +// permissionExplainDialog.dismiss(); +// } +// +// @Override +// public void onDenial( +// List permissionsDenial, List permissionDenialForever) { +// permissionExplainDialog.dismiss(); +// Map 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 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 map1 = new HashMap<>(); - map1.put("code", 0); - map1.put("error", "定位失败"); - callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1)); - - } - } else { - Map 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 map1 = new HashMap<>(); +// map1.put("code", 0); +// map1.put("error", "定位失败"); +// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1)); +// +// } +// } else { +// Map 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

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 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 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
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 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 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(); diff --git a/app/src/main/java/com/dskj/rbchat/imkit/add/FunAddFriendActivity.java b/app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/imkit/add/FunAddFriendActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java index 4d0058b..d6584a7 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/add/FunAddFriendActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/base/BaseSettingOtherActivity.java b/app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java similarity index 59% rename from app/src/main/java/com/dskj/rbchat/imkit/base/BaseSettingOtherActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java index 8150834..1896af1 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/base/BaseSettingOtherActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java @@ -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; /** diff --git a/app/src/main/java/com/dskj/rbchat/imkit/base/fragment/SettingPhotoFragment.java b/app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/imkit/base/fragment/SettingPhotoFragment.java rename to app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java index 89bd728..f9b855c 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/base/fragment/SettingPhotoFragment.java +++ b/app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/person/PersonOtherSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/imkit/person/PersonOtherSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java index 54198dd..0fe1570 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/person/PersonOtherSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/person/PersonSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/imkit/person/PersonSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java index 3872766..c01a441 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/person/PersonSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java b/app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java index 36eea64..c9d7095 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 -> { diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/BaseTeamQrSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/imkit/team/BaseTeamQrSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java index b08c7f9..d0bbf98 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/BaseTeamQrSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/SettingResourceActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/imkit/team/SettingResourceActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java index 31aa8a6..d69bad3 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/SettingResourceActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamAddManagerActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamAddManagerActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java index 0b6e91e..d2f2c73 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamAddManagerActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamAnnouncementActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamAnnouncementActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java index 0ffcc7f..220cf30 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamAnnouncementActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamHeadBgSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamHeadBgSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java index 4fec64f..98638a2 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamHeadBgSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamInvitedJoinActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamInvitedJoinActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java index 03a1dd7..46b111e 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamInvitedJoinActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamManagerActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamManagerActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java index d15b32d..d875e2a 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamManagerActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java new file mode 100644 index 0000000..35382dc --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java @@ -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 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 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(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(); + } + +} diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java index 8b0f693..fc30170 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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> 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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamOtherSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamOtherSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java index c8dfe5e..f1016bf 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamOtherSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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()); } } }); diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/imkit/team/TeamSettingActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java index 4ba401d..b0b6fda 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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() { diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java b/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java rename to app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java index 683a5ef..4a911f8 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 { diff --git a/app/src/main/java/com/dskj/rbchat/imkit/verify/FunVerifyListActivity.java b/app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/imkit/verify/FunVerifyListActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java index c6a9cd1..6746eaa 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/verify/FunVerifyListActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/imkit/watch/CheckImageVideoActivity.java b/app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/imkit/watch/CheckImageVideoActivity.java rename to app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java index 66a398a..6122782 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/watch/CheckImageVideoActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/jpush/LocalBroadcastManager.java b/app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/jpush/LocalBroadcastManager.java rename to app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java index b7667b7..2b3225d 100644 --- a/app/src/main/java/com/dskj/rbchat/jpush/LocalBroadcastManager.java +++ b/app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java @@ -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); } } } diff --git a/app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java b/app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java new file mode 100644 index 0000000..a7a33c3 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java @@ -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() { +// +// } +//} diff --git a/app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java new file mode 100644 index 0000000..6b1bfa2 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java @@ -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 setActionCache = new SparseArray(); +// +// 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 tags; +// String alias; +// boolean isAliasAction; +// +// @Override +// public String toString() { +// return "TagAliasBean{" + +// "action=" + action + +// ", tags=" + tags + +// ", alias='" + alias + '\'' + +// ", isAliasAction=" + isAliasAction + +// '}'; +// } +// } +// +// +//} diff --git a/app/src/main/java/com/dskj/rbchat/jpush/Utils.java b/app/src/main/java/com/hbl/lewan/jpush/Utils.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/jpush/Utils.java rename to app/src/main/java/com/hbl/lewan/jpush/Utils.java index 88923eb..c4eeb2e 100644 --- a/app/src/main/java/com/dskj/rbchat/jpush/Utils.java +++ b/app/src/main/java/com/hbl/lewan/jpush/Utils.java @@ -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 ""; + } } diff --git a/app/src/main/java/com/dskj/rbchat/login/ChongZhiActivity.java b/app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/login/ChongZhiActivity.java rename to app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java index a6a0073..066235b 100644 --- a/app/src/main/java/com/dskj/rbchat/login/ChongZhiActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/login/LoginActivity.java b/app/src/main/java/com/hbl/lewan/login/LoginActivity.java similarity index 83% rename from app/src/main/java/com/dskj/rbchat/login/LoginActivity.java rename to app/src/main/java/com/hbl/lewan/login/LoginActivity.java index 39b7b56..b4d3419 100644 --- a/app/src/main/java/com/dskj/rbchat/login/LoginActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/LoginActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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(); } diff --git a/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java b/app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java rename to app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java index e368dd9..9347211 100644 --- a/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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(); } diff --git a/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java similarity index 82% rename from app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java rename to app/src/main/java/com/hbl/lewan/login/RegisterActivity.java index 68934d3..0c92e9a 100644 --- a/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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>() { +// @Override +// public void onSuccess(Result 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>() { + .subscribe(new BaseObserver<>() { @Override - public void onSuccess(Result feedbackResp) { + public void onSuccess(Result 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"; + +// 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; + + } - OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken); - OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider); - toUpdateOss(bucketName, 0, oss, file); } + + +// 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()); +// } +// } +// }); +//// } +// } diff --git a/app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java b/app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java new file mode 100644 index 0000000..7ca4fdf --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java @@ -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 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 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 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>() { +// +// @Override +// public void onSuccess(Result 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 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>() { +// +// @Override +// public void onSuccess(Result 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 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 feedbackResp) { +// doLogin(); +// } +// +// @Override +// public void onError(int code, String msg) { +// LogUtils.i("获取到的错误:" + code + "" + msg); +// ToastX.showShortToast(msg); +// } +// }); +// +// +// } +// +// /** +// * 实施登录的方法. +// *

+// * 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理. +// * +// */ +// 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 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>() { +//// +//// @Override +//// public void onSuccess(Result feedbackResp) { +//// avaterBean = feedbackResp.data; +//// } +//// +//// @Override +//// public void onError(int code, String msg) { +//// } +//// }); +//// } +// +// +// private void toStep2() { +// hideSoftInput(RegisterActivityBf.this); +// Map 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>() { +// +// @Override +// public void onSuccess(Result 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 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 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 call) { +// Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget() { +// @Override +// public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition 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() { +// @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>() { +// @Override +// public void onSuccess(Result 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); +// } +// +//} diff --git a/app/src/main/java/com/dskj/rbchat/login/WangjiActivity.java b/app/src/main/java/com/hbl/lewan/login/WangjiActivity.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/login/WangjiActivity.java rename to app/src/main/java/com/hbl/lewan/login/WangjiActivity.java index 8a73938..7999356 100644 --- a/app/src/main/java/com/dskj/rbchat/login/WangjiActivity.java +++ b/app/src/main/java/com/hbl/lewan/login/WangjiActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java b/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java new file mode 100644 index 0000000..9f73d68 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java @@ -0,0 +1,131 @@ +//// Copyright (c) 2022 NetEase, Inc. All rights reserved. +//// Use of this source code is governed by a MIT license that can be +//// found in the LICENSE file. +// +//package com.hbl.lewan.main; +// +//import com.netease.nimlib.sdk.avsignalling.constant.ChannelType; +//import com.netease.nimlib.sdk.msg.MessageBuilder; +//import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment; +//import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; +//import com.netease.nimlib.sdk.msg.model.IMMessage; +//import com.netease.yunxin.kit.alog.ALog; +//import com.netease.yunxin.kit.alog.ParameterMap; +//import com.netease.yunxin.kit.chatkit.repo.ChatRepo; +//import com.netease.yunxin.kit.common.utils.NetworkUtils; +//import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall; +//import com.netease.yunxin.nertc.nertcvideocall.model.impl.DefaultCallOrderImpl; +//import com.netease.yunxin.nertc.nertcvideocall.model.impl.state.CallState; +//import com.netease.yunxin.nertc.nertcvideocall.utils.CallParams; +//import com.netease.yunxin.nertc.nertcvideocall.utils.NrtcCallStatus; +//import java.util.Collections; +//import java.util.List; +// +//class CustomCallOrderHelper extends DefaultCallOrderImpl { +// private static final String TAG = "CustomCallOrderHelper"; +// +// @Override +// public void onCanceled(ChannelType channelType, String accountId, int callType) { +// ALog.dApi( +// TAG, +// new ParameterMap("onCanceled") +// .append("channelType", channelType) +// .append("callType", callType) +// .append("accountId", accountId) +// .append("enableOrder", isEnable()) +// .toValue()); +// if (!isEnable()) { +// return; +// } +// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType); +// } +// +// @Override +// public void onReject(ChannelType channelType, String accountId, int callType) { +// ALog.dApi( +// TAG, +// new ParameterMap("onReject") +// .append("channelType", channelType) +// .append("callType", callType) +// .append("accountId", accountId) +// .append("enableOrder", isEnable()) +// .toValue()); +// if (!isEnable()) { +// return; +// } +// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusRejected, callType); +// } +// +// @Override +// public void onTimeout(ChannelType channelType, String accountId, int callType) { +// ALog.dApi( +// TAG, +// new ParameterMap("onTimeout") +// .append("channelType", channelType) +// .append("callType", callType) +// .append("accountId", accountId) +// .append("enableOrder", isEnable()) +// .toValue()); +// if (!isEnable()) { +// return; +// } +// if (NERTCVideoCall.sharedInstance().getCurrentState() == CallState.STATE_INVITED) { +// return; +// } +// if (NetworkUtils.isConnected()) { +// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusTimeout, callType); +// } else { +// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType); +// } +// } +// +// @Override +// public void onBusy(ChannelType channelType, String accountId, int callType) { +// ALog.dApi( +// TAG, +// new ParameterMap("onBusy") +// .append("channelType", channelType) +// .append("callType", callType) +// .append("accountId", accountId) +// .append("enableOrder", isEnable()) +// .toValue()); +// if (!isEnable()) { +// return; +// } +// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusBusy, callType); +// } +// +// public static void sendOrder( +// ChannelType channelType, String accountId, int status, int callType) { +// sendOrder(channelType, accountId, status, Collections.emptyList(), callType); +// } +// +// public static void sendOrder( +// ChannelType channelType, +// String accountId, +// int status, +// List durations, +// int callType) { +// ALog.dApi( +// TAG, +// new ParameterMap("sendOrder") +// .append("status", status) +// .append("channelType", channelType) +// .append("callType", callType) +// .append("durations", durations) +// .append("accountId", accountId) +// .toValue()); +// if (callType == CallParams.CallType.P2P) { +// NetCallAttachment netCallAttachment = +// new NetCallAttachment.NetCallAttachmentBuilder() +// .withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue()) +// .withStatus(status) +// .withDurations(durations) +// .build(); +// IMMessage message = +// MessageBuilder.createNrtcNetcallMessage( +// accountId, SessionTypeEnum.P2P, netCallAttachment); +// ChatRepo.sendMessage(message, true, null); +// } +// } +//} diff --git a/app/src/main/java/com/dskj/rbchat/main/FragmentAdapter.java b/app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/FragmentAdapter.java rename to app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java index 089599d..94e18ac 100644 --- a/app/src/main/java/com/dskj/rbchat/main/FragmentAdapter.java +++ b/app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.dskj.rbchat.main; +package com.hbl.lewan.main; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/dskj/rbchat/main/MainActivity.java b/app/src/main/java/com/hbl/lewan/main/MainActivity.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/main/MainActivity.java rename to app/src/main/java/com/hbl/lewan/main/MainActivity.java index ad5d85c..ccc96e0 100644 --- a/app/src/main/java/com/dskj/rbchat/main/MainActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/MainActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 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 function1) { - LogUtils.d("s===" + s + function1); - FriendInfo friendInfo = ContactRepo.getFriend(s); - if (friendInfo != null) { - function1.invoke(friendInfo.getName()); - } - return true; - } - - @Override - public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1 function1) { - return false; - } - - @Override - public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) { - return false; - } - }) - .timeOutMillisecond(30 * 1000L) - .pushConfigProvider(new PushConfigProvider() { - @Override - public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) { - return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue() - ? getString(R.string.incoming_call_notify_audio) - : getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue() - ? getString(R.string.incoming_call_notify_audio) - : getString(R.string.incoming_call_notify_video)), - setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId)) - ); - } - }) - // 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true - .resumeBGInvitation(true) - .notificationConfigFetcher(new Function1() { - @RequiresApi(api = Build.VERSION_CODES.O) - @Override - public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) { - UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId); - String content = - (info != null ? info.getUserInfoName() : invitedInfo.currentAccId) - + (invitedInfo.channelType == ChannelType.AUDIO.getValue() - ? getString(R.string.incoming_call_notify_audio) - : getString(R.string.incoming_call_notify_video)); - String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo()); - LogUtils.d("NotificationConfig callName==" + callName); - int rawResource = getResources().getIdentifier(callName, "raw", getPackageName()); - Uri musicUri = Uri.parse("android.resource://com.dskj.rbchat/raw/" + callName); - return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri); - } - }) - // 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置) - //.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法 - // 设置初始化 rtc sdk 相关配置，按照所需进行配置 - .rtcSdkOption(new NERtcOption()) - // 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁 - // 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false - .rtcInitScope(false) - .build(); - // 设置自定义话单消息发送 - NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper()); -// // 若重复初始化会销毁之前的初始化实例，重新初始化 - CallKitUI.init(getApplicationContext(), options); - - NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer() { - @Override - public void onEvent(StatusCode statusCode) { - if (statusCode == StatusCode.LOGOUT) { - CallKitUI.destroy(); - } else if (statusCode.wontAutoLogin()) { - if (!isFinishing()) { - ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false); - actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() { - @Override - public void toSumbit() { - DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, ""); - DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, ""); - startActivity(new Intent(MainActivity.this, WelcomeActivity.class)); - CallKitUI.destroy(); - finish(); - } - - @Override - public void toCancel() { - DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, ""); - DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, ""); - startActivity(new Intent(MainActivity.this, WelcomeActivity.class)); - CallKitUI.destroy(); - finish(); - } - }); - actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp); - actionConfirmDialog.show(); - } - } - } - }, true); - } +// private void configCallKit() { +// CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() { +// @Override +// public boolean isEnable() { +// return true; +// } +// +// @Nullable +// @Override +// public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) { +// int resId; +// if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) { +// resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring; +// } else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) { +// resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName()); +// } else { +// //結束 +// resId = R.raw.nosound; +// } +// return resId; +// } +// }).rtcAppKey(DataUtils.readAppKey(this)) +// .currentUserAccId(IMKitClient.account()) +// .userInfoHelper(new UserInfoHelper() { +// @Override +// public boolean fetchNickname(@NonNull String s, @NonNull Function1 function1) { +// LogUtils.d("s===" + s + function1); +// FriendInfo friendInfo = ContactRepo.getFriend(s); +// if (friendInfo != null) { +// function1.invoke(friendInfo.getName()); +// } +// return true; +// } +// +// @Override +// public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1 function1) { +// return false; +// } +// +// @Override +// public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) { +// return false; +// } +// }) +// .timeOutMillisecond(30 * 1000L) +// .pushConfigProvider(new PushConfigProvider() { +// @Override +// public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) { +// return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue() +// ? getString(R.string.incoming_call_notify_audio) +// : getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue() +// ? getString(R.string.incoming_call_notify_audio) +// : getString(R.string.incoming_call_notify_video)), +// setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId)) +// ); +// } +// }) +// // 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true +// .resumeBGInvitation(true) +// .notificationConfigFetcher(new Function1() { +// @RequiresApi(api = Build.VERSION_CODES.O) +// @Override +// public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) { +// UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId); +// String content = +// (info != null ? info.getUserInfoName() : invitedInfo.currentAccId) +// + (invitedInfo.channelType == ChannelType.AUDIO.getValue() +// ? getString(R.string.incoming_call_notify_audio) +// : getString(R.string.incoming_call_notify_video)); +// String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo()); +// LogUtils.d("NotificationConfig callName==" + callName); +// int rawResource = getResources().getIdentifier(callName, "raw", getPackageName()); +// Uri musicUri = Uri.parse("android.resource://com.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() { +// @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 setPushPload(UserInfo userInfo) { Map 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 titleUsers; private ArrayList titleUsersIsCheck; diff --git a/app/src/main/java/com/dskj/rbchat/main/authorize/AuthorizeActivity.java b/app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/authorize/AuthorizeActivity.java rename to app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java index a6859c7..b3a1486 100644 --- a/app/src/main/java/com/dskj/rbchat/main/authorize/AuthorizeActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java @@ -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(); diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/AllConversationFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/chat/AllConversationFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java index b5d9f83..ed3aab8 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/AllConversationFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java index 7049a86..d5458ef 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java @@ -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,8 +252,12 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe String values = array.getString(0); if (!TextUtils.isEmpty(values)) { String[] groupIdStr = values.split(","); - groupIds.addAll(Arrays.asList(groupIdStr)); - queryTeamInfo(); + if(ApiService.AREA_CODE.equals("+86")) { + groupIds.addAll(Arrays.asList(groupIdStr)); + LogUtils.i("获取到的错误1:" + groupIds); + queryTeamInfo(); + } + } } } catch (JSONException e) { @@ -271,37 +277,30 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe } private void queryTeamInfo() { + List 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() { - @Override - public void onSuccess(Team result) { - addShiJieConversation(result); - } - - @Override - public void onFailed(int code) { - - } - - @Override - public void onException(Throwable exception) { - - } - }); + if (!TextUtils.isEmpty(groupId)) { + teams.add(Long.parseLong(groupId)); + } } + NIMClient.getService(TeamService.class).searchTeam(teams).setCallback(new RequestCallback() { + @Override + public void onSuccess(TeamInfoResult result) { + for (int i = 0; i < result.getTeamInfoList().size(); i++) { + addShiJieConversation(result.getTeamInfoList().get(i)); + } + } + @Override + public void onFailed(int code) { + + } + + @Override + public void onException(Throwable exception) { + + } + }); } // public void updateShiJieTeamInfo(List result) { @@ -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) { - viewBinding.layoutShijiechat.setVisibility(View.VISIBLE); + 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 { - viewBinding.layoutShijiechat.setVisibility(View.VISIBLE); + 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); } diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatGroupFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/chat/ChatGroupFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java index 01d79ae..7718b08 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatGroupFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatMain2Fragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/chat/ChatMain2Fragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java index f67bf42..37b62a7 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatMain2Fragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatMainFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/chat/ChatMainFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java index e0f9e10..20e5884 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatMainFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatTabFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/main/chat/ChatTabFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java index 452cce2..1ebc0c3 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatTabFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ContactActivity.java b/app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java similarity index 86% rename from app/src/main/java/com/dskj/rbchat/main/chat/ContactActivity.java rename to app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java index 84712dc..8c31095 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ContactActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java @@ -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; //通讯录 diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ContactFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/chat/ContactFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java index 10d185a..a9990b4 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/ContactFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 -> { diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/EditChatRecordlistActivity.java b/app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/main/chat/EditChatRecordlistActivity.java rename to app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java index b6e2acb..6d4067e 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/EditChatRecordlistActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/FollowListFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/main/chat/FollowListFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java index 07515a4..b90fc14 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/FollowListFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/FriendConversationFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/chat/FriendConversationFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java index f57677a..bc4b56d 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/FriendConversationFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/TeamConversationFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/chat/TeamConversationFragment.java rename to app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java index fa9f500..a50f657 100644 --- a/app/src/main/java/com/dskj/rbchat/main/chat/TeamConversationFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/home/CustomServicesActivity.java b/app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/main/home/CustomServicesActivity.java rename to app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java index 96434ac..bd795d7 100644 --- a/app/src/main/java/com/dskj/rbchat/main/home/CustomServicesActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/home/HomeFragment.java b/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java similarity index 85% rename from app/src/main/java/com/dskj/rbchat/main/home/HomeFragment.java rename to app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java index 1a3ab22..242d87d 100644 --- a/app/src/main/java/com/dskj/rbchat/main/home/HomeFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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) diff --git a/app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java b/app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java new file mode 100644 index 0000000..cac7cd5 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java @@ -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 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(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 = 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 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(); +//// } +// +// +//} +// +// +// +// +// diff --git a/app/src/main/java/com/dskj/rbchat/main/index/Index2Fragment.java b/app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/main/index/Index2Fragment.java rename to app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java index 6021db5..86f8af5 100644 --- a/app/src/main/java/com/dskj/rbchat/main/index/Index2Fragment.java +++ b/app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 -> { diff --git a/app/src/main/java/com/dskj/rbchat/main/index/Index2FragmentBf.java b/app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/main/index/Index2FragmentBf.java rename to app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java index f0d8f2f..c3ce616 100644 --- a/app/src/main/java/com/dskj/rbchat/main/index/Index2FragmentBf.java +++ b/app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 -> { diff --git a/app/src/main/java/com/dskj/rbchat/main/index/IndexFragment.java b/app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/index/IndexFragment.java rename to app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java index 2159f35..a3e4bc3 100644 --- a/app/src/main/java/com/dskj/rbchat/main/index/IndexFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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 -> { diff --git a/app/src/main/java/com/dskj/rbchat/main/index/adapter/IndexContactAdapter.java b/app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/index/adapter/IndexContactAdapter.java rename to app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java index 38d5189..bfc9c6f 100644 --- a/app/src/main/java/com/dskj/rbchat/main/index/adapter/IndexContactAdapter.java +++ b/app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/index/add/AddFriendsActivity.java b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/index/add/AddFriendsActivity.java rename to app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java index ec0c5f9..4e23a9e 100644 --- a/app/src/main/java/com/dskj/rbchat/main/index/add/AddFriendsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java @@ -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)); diff --git a/app/src/main/java/com/dskj/rbchat/main/message/NotifyActMessageActivity.java b/app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/main/message/NotifyActMessageActivity.java rename to app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java index 391bb60..363a6fb 100644 --- a/app/src/main/java/com/dskj/rbchat/main/message/NotifyActMessageActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageActivity.java b/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageActivity.java rename to app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java index b941814..9143148 100644 --- a/app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageDetailsActivity.java b/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageDetailsActivity.java rename to app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java index 7b99b6a..4d0a373 100644 --- a/app/src/main/java/com/dskj/rbchat/main/message/NotifyMessageDetailsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/AccountAndSecurityActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/main/mine/AccountAndSecurityActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java index 3fc146b..8e59fd1 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/AccountAndSecurityActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java @@ -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); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/ChangeAccoutActionActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/mine/ChangeAccoutActionActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java index fd78545..0bfdcae 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/ChangeAccoutActionActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/ChangePasswordActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/main/mine/ChangePasswordActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java index 4936b50..e0d4ed7 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/ChangePasswordActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java index 0813741..9ac0710 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/CloseAccountActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/main/mine/CloseAccountActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java index d9d6404..8701eae 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/CloseAccountActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/EditFriendUserInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/EditFriendUserInfoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java index be56745..b8cd40d 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/EditFriendUserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/EditUserInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/mine/EditUserInfoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java index 52e04d8..1d2804a 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/EditUserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/FriendPermissionsActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/main/mine/FriendPermissionsActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java index bd842ed..2008333 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/FriendPermissionsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/Help1Activity.java b/app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/Help1Activity.java rename to app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java index 2f0caaa..c236d62 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/Help1Activity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/HelpActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/main/mine/HelpActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java index d044d7a..1349c28 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/HelpActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/MineFragment.java b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/main/mine/MineFragment.java rename to app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java index 399589e..e9f69d7 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/MineFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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); } diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/MineFragmentBf.java b/app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/MineFragmentBf.java rename to app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java index aaef18a..fc73778 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/MineFragmentBf.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java @@ -2,7 +2,7 @@ //// Use of this source code is governed by a MIT license that can be //// found in the LICENSE file. // -//package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/MineInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/mine/MineInfoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java index 1da42f5..cc22846 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/MineInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/SettingAccoutIdActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/SettingAccoutIdActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java index d013674..774cb61 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/SettingAccoutIdActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/TypeSelectActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/main/mine/TypeSelectActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java index 05e7c5e..4f3da78 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/TypeSelectActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/UnBindPhoneActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/main/mine/UnBindPhoneActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java index 20a0241..572b104 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/UnBindPhoneActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/UserHeadEditActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java similarity index 73% rename from app/src/main/java/com/dskj/rbchat/main/mine/UserHeadEditActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java index b3f68e3..9c3607e 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/UserHeadEditActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java @@ -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 { private ActivityHeadUserEditBinding binding; @@ -148,28 +125,29 @@ 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(); - loadData(IMKitClient.account()); - if (loginBean != null) { - if (!TextUtils.isEmpty(loginBean.getUser().getPostHomepageBackground())) { - String pram = loginBean.getUser().getPostHomepageBackground(); - String url = IMUIKitConfig.OSS_URL + pram; - Glide.with(UserHeadEditActivity.this) - .load(url) - .into(binding.forbgIv); +// if(!getIntent().getBooleanExtra("start",false)) { + loadData(IMKitClient.account()); + if (loginBean != null) { + if (!TextUtils.isEmpty(loginBean.getUser().getPostHomepageBackground())) { + String pram = loginBean.getUser().getPostHomepageBackground(); + String url = IMUIKitConfig.OSS_URL + pram; + Glide.with(UserHeadEditActivity.this) + .load(url) + .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>() { + .subscribe(new BaseObserver<>() { @Override - public void onSuccess(Result feedbackResp) { + public void onSuccess(Result 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 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 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); } } @@ -722,7 +813,7 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback private void toXiangji(boolean isBg) { // if(!isBg){ - PhotoPicker.getInstance().takePhotoCorpAndUpload(UserHeadEditActivity.this, this); + PhotoPicker.getInstance().takePhotoCorpAndUpload(UserHeadEditActivity.this, this); // }else{ //// PhotoPicker.getInstance().takePhoto(UserHeadEditActivity.this,this); // pickMediaLauncher.launch("image/*;video/*"); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/UserInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/mine/UserInfoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java index 7be883a..6a8f388 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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()); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/AddPhotoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java similarity index 72% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/AddPhotoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java index d0661a2..59eabe6 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/AddPhotoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java @@ -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>() { + .subscribe(new BaseObserver<>() { @Override - public void onSuccess(Result feedbackResp) { - stsCredentialsBean = feedbackResp.data; - toAliYunOss(); + public void onSuccess(Result feedbackResp) { + stsCredentialsBean1 = feedbackResp.data; +// toAliYunOss(file, isHead); + toUpdateOssNew(0); + } @Override @@ -189,75 +201,139 @@ 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 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); - } - 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(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); -// 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); + 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)); } - - @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()); - } - } - }); + }, 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() { +// 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(); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/EditPhotoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/EditPhotoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java index 50403cc..89750ee 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/EditPhotoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoDetailsActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java similarity index 81% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoDetailsActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java index 4cdbbac..67c3ca6 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoDetailsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java @@ -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 uriStrings = new ArrayList<>(); StsCredentialsBean stsCredentialsBean; + String stsCredentialsBean1; + List localMedias = new ArrayList<>(); List 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>() { +// @Override +// public void onSuccess(Result 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>() { + .subscribe(new BaseObserver<>() { @Override - public void onSuccess(Result feedbackResp) { - stsCredentialsBean = feedbackResp.data; - toAliYunOss(); + public void onSuccess(Result 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 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); - 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(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); -// 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); + 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)); } - - @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()); - } - } - }); + }, 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() { +// 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(); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoListActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoListActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java index 63349fe..1dc389d 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoListActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserSelectPhotoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java similarity index 86% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/UserSelectPhotoActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java index 4558285..4223585 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/UserSelectPhotoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/photo/WatchImagesActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/photo/WatchImagesActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java index 07982fc..df286f4 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/photo/WatchImagesActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java @@ -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)); diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java index 7a225a3..bfaf521 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java @@ -2,14 +2,14 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheViewModel.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheViewModel.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java index 6ecd7b6..c9db0a4 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/ClearCacheViewModel.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.dskj.rbchat.main.mine.setting; +package com.hbl.lewan.main.mine.setting; import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java index eef4a56..df55dc9 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java new file mode 100644 index 0000000..a044492 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java @@ -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)); +// } +} diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java index aa15598..123cd3d 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyRingActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyRingActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java index 7bf220f..b7cc6ed 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyRingActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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(); } diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyViewModel.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyViewModel.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java index f3d6563..8a08cf7 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyViewModel.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java @@ -2,12 +2,12 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingViewModel.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingViewModel.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java index c9cdc3a..ae6dbab 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingViewModel.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SkinActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/main/mine/setting/SkinActivity.java rename to app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java index 111ce98..452bb88 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/setting/SkinActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java @@ -2,14 +2,14 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/map/LocationPageActivity1.java b/app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java similarity index 65% rename from app/src/main/java/com/dskj/rbchat/map/LocationPageActivity1.java rename to app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java index 6400370..1c8d8e3 100644 --- a/app/src/main/java/com/dskj/rbchat/map/LocationPageActivity1.java +++ b/app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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.") -// .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)); - } - } - +// @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)); +// } +// } +// /** * 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> 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> 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> 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> 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() { diff --git a/app/src/main/java/com/dskj/rbchat/model/ActivityMsgBean.java b/app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/ActivityMsgBean.java rename to app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java index 17787b1..1a76a29 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ActivityMsgBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/AdBean.java b/app/src/main/java/com/hbl/lewan/model/AdBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/AdBean.java rename to app/src/main/java/com/hbl/lewan/model/AdBean.java index 42f935c..45e1088 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AdBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AdBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AdBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/AddFriendBean.java b/app/src/main/java/com/hbl/lewan/model/AddFriendBean.java similarity index 82% rename from app/src/main/java/com/dskj/rbchat/model/AddFriendBean.java rename to app/src/main/java/com/hbl/lewan/model/AddFriendBean.java index 7e7732f..9d86441 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AddFriendBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AddFriendBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AddFriendBean { public String user_uid; diff --git a/app/src/main/java/com/dskj/rbchat/model/AfterCountBean.java b/app/src/main/java/com/hbl/lewan/model/AfterCountBean.java similarity index 86% rename from app/src/main/java/com/dskj/rbchat/model/AfterCountBean.java rename to app/src/main/java/com/hbl/lewan/model/AfterCountBean.java index 0e2651e..6964afe 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AfterCountBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AfterCountBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AfterCountBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/AiChatUpdateEvent.java b/app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/AiChatUpdateEvent.java rename to app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java index 493f55f..d47c5d3 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AiChatUpdateEvent.java +++ b/app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/dskj/rbchat/model/AiConvertBean.java b/app/src/main/java/com/hbl/lewan/model/AiConvertBean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/AiConvertBean.java rename to app/src/main/java/com/hbl/lewan/model/AiConvertBean.java index 905d404..c596cfe 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AiConvertBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AiConvertBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AiConvertBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/AiMessageBean.java b/app/src/main/java/com/hbl/lewan/model/AiMessageBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/AiMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/AiMessageBean.java index eef4839..817d02e 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AiMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AiMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dskj/rbchat/model/AlbumBean.java b/app/src/main/java/com/hbl/lewan/model/AlbumBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/AlbumBean.java rename to app/src/main/java/com/hbl/lewan/model/AlbumBean.java index 2ed202a..e33cd36 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AlbumBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AlbumBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/AlbumItemBean.java b/app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/AlbumItemBean.java rename to app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java index 00b6d46..878b899 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AlbumItemBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/AuthorizeBean.java b/app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/model/AuthorizeBean.java rename to app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java index d5d621b..d44298c 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AuthorizeBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AuthorizeBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/AvaterBean.java b/app/src/main/java/com/hbl/lewan/model/AvaterBean.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/model/AvaterBean.java rename to app/src/main/java/com/hbl/lewan/model/AvaterBean.java index d5becf2..fe422ec 100644 --- a/app/src/main/java/com/dskj/rbchat/model/AvaterBean.java +++ b/app/src/main/java/com/hbl/lewan/model/AvaterBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class AvaterBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/BankBean.java b/app/src/main/java/com/hbl/lewan/model/BankBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/BankBean.java rename to app/src/main/java/com/hbl/lewan/model/BankBean.java index 37108f8..ba6ed6d 100644 --- a/app/src/main/java/com/dskj/rbchat/model/BankBean.java +++ b/app/src/main/java/com/hbl/lewan/model/BankBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class BankBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/BankListBean.java b/app/src/main/java/com/hbl/lewan/model/BankListBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/BankListBean.java rename to app/src/main/java/com/hbl/lewan/model/BankListBean.java index 8facaae..48d1845 100644 --- a/app/src/main/java/com/dskj/rbchat/model/BankListBean.java +++ b/app/src/main/java/com/hbl/lewan/model/BankListBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class BankListBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/BillBean.java b/app/src/main/java/com/hbl/lewan/model/BillBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/BillBean.java rename to app/src/main/java/com/hbl/lewan/model/BillBean.java index dbe66af..1af2188 100644 --- a/app/src/main/java/com/dskj/rbchat/model/BillBean.java +++ b/app/src/main/java/com/hbl/lewan/model/BillBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; diff --git a/app/src/main/java/com/dskj/rbchat/model/BindBean.java b/app/src/main/java/com/hbl/lewan/model/BindBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/BindBean.java rename to app/src/main/java/com/hbl/lewan/model/BindBean.java index dbd4b70..83d231b 100644 --- a/app/src/main/java/com/dskj/rbchat/model/BindBean.java +++ b/app/src/main/java/com/hbl/lewan/model/BindBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/BindUserBean.java b/app/src/main/java/com/hbl/lewan/model/BindUserBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/BindUserBean.java rename to app/src/main/java/com/hbl/lewan/model/BindUserBean.java index 25100aa..7edc4da 100644 --- a/app/src/main/java/com/dskj/rbchat/model/BindUserBean.java +++ b/app/src/main/java/com/hbl/lewan/model/BindUserBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/CallBean.java b/app/src/main/java/com/hbl/lewan/model/CallBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/CallBean.java rename to app/src/main/java/com/hbl/lewan/model/CallBean.java index aee56b1..747bb9a 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CallBean.java +++ b/app/src/main/java/com/hbl/lewan/model/CallBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class CallBean { /**0 语音消息 1 视频消息*/ diff --git a/app/src/main/java/com/dskj/rbchat/model/ChargingBean.java b/app/src/main/java/com/hbl/lewan/model/ChargingBean.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/model/ChargingBean.java rename to app/src/main/java/com/hbl/lewan/model/ChargingBean.java index 52d7529..4a03205 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ChargingBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ChargingBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class ChargingBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/CirPushMessage.java b/app/src/main/java/com/hbl/lewan/model/CirPushMessage.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/CirPushMessage.java rename to app/src/main/java/com/hbl/lewan/model/CirPushMessage.java index a3efaef..9024364 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CirPushMessage.java +++ b/app/src/main/java/com/hbl/lewan/model/CirPushMessage.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class CirPushMessage { diff --git a/app/src/main/java/com/dskj/rbchat/model/CircleShareBean.java b/app/src/main/java/com/hbl/lewan/model/CircleShareBean.java similarity index 83% rename from app/src/main/java/com/dskj/rbchat/model/CircleShareBean.java rename to app/src/main/java/com/hbl/lewan/model/CircleShareBean.java index c7c72ca..646feb6 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CircleShareBean.java +++ b/app/src/main/java/com/hbl/lewan/model/CircleShareBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import com.netease.yunxin.kit.chatkit.ui.custom.StickerAttachment; diff --git a/app/src/main/java/com/dskj/rbchat/model/CommentBean.java b/app/src/main/java/com/hbl/lewan/model/CommentBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/CommentBean.java rename to app/src/main/java/com/hbl/lewan/model/CommentBean.java index fbf30a4..9361604 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CommentBean.java +++ b/app/src/main/java/com/hbl/lewan/model/CommentBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/ConfigBean.java b/app/src/main/java/com/hbl/lewan/model/ConfigBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/ConfigBean.java rename to app/src/main/java/com/hbl/lewan/model/ConfigBean.java index 61dac50..eb90c18 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ConfigBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ConfigBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; /** * 配置开关 diff --git a/app/src/main/java/com/dskj/rbchat/model/CountryBean.java b/app/src/main/java/com/hbl/lewan/model/CountryBean.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/model/CountryBean.java rename to app/src/main/java/com/hbl/lewan/model/CountryBean.java index fe9d091..306b05e 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CountryBean.java +++ b/app/src/main/java/com/hbl/lewan/model/CountryBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/CreditsConfBean.java b/app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/CreditsConfBean.java rename to app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java index a5ee222..3b16bec 100644 --- a/app/src/main/java/com/dskj/rbchat/model/CreditsConfBean.java +++ b/app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class CreditsConfBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/DongTaiActionBean.java b/app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/DongTaiActionBean.java rename to app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java index 3f5e1a3..faf7637 100644 --- a/app/src/main/java/com/dskj/rbchat/model/DongTaiActionBean.java +++ b/app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class DongTaiActionBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/EditMessageBean.java b/app/src/main/java/com/hbl/lewan/model/EditMessageBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/EditMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/EditMessageBean.java index 99f5bfa..d2b4f30 100644 --- a/app/src/main/java/com/dskj/rbchat/model/EditMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/EditMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/ExchangeConfBean.java b/app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/ExchangeConfBean.java rename to app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java index a743646..01e052b 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ExchangeConfBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/ExplorePostPinglunBean.java b/app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/ExplorePostPinglunBean.java rename to app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java index 74e2c91..a5f1371 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ExplorePostPinglunBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class ExplorePostPinglunBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/ForBiddenInfoBean.java b/app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/ForBiddenInfoBean.java rename to app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java index 92cd947..9a954da 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ForBiddenInfoBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class ForBiddenInfoBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/FukuanResultBean.java b/app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/FukuanResultBean.java rename to app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java index 34c3346..214cc73 100644 --- a/app/src/main/java/com/dskj/rbchat/model/FukuanResultBean.java +++ b/app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class FukuanResultBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/GameBean.java b/app/src/main/java/com/hbl/lewan/model/GameBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/GameBean.java rename to app/src/main/java/com/hbl/lewan/model/GameBean.java index ae2f2e5..d7a034e 100644 --- a/app/src/main/java/com/dskj/rbchat/model/GameBean.java +++ b/app/src/main/java/com/hbl/lewan/model/GameBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; diff --git a/app/src/main/java/com/dskj/rbchat/model/GroupActionBean.java b/app/src/main/java/com/hbl/lewan/model/GroupActionBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/GroupActionBean.java rename to app/src/main/java/com/hbl/lewan/model/GroupActionBean.java index e092cca..639d6e9 100644 --- a/app/src/main/java/com/dskj/rbchat/model/GroupActionBean.java +++ b/app/src/main/java/com/hbl/lewan/model/GroupActionBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class GroupActionBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/GroupAtMessageBean.java b/app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/GroupAtMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java index 4d4b914..e251a9b 100644 --- a/app/src/main/java/com/dskj/rbchat/model/GroupAtMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/GroupBeanResult.java b/app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/GroupBeanResult.java rename to app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java index 6308e0d..a983cde 100644 --- a/app/src/main/java/com/dskj/rbchat/model/GroupBeanResult.java +++ b/app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/GroupListBean.java b/app/src/main/java/com/hbl/lewan/model/GroupListBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/GroupListBean.java rename to app/src/main/java/com/hbl/lewan/model/GroupListBean.java index 5ba0681..1d8b59c 100644 --- a/app/src/main/java/com/dskj/rbchat/model/GroupListBean.java +++ b/app/src/main/java/com/hbl/lewan/model/GroupListBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class GroupListBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/H5ChangeTitle.java b/app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/H5ChangeTitle.java rename to app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java index 73fd90a..f4a281f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/H5ChangeTitle.java +++ b/app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class H5ChangeTitle { diff --git a/app/src/main/java/com/dskj/rbchat/model/HisChatShowBean.java b/app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/HisChatShowBean.java rename to app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java index 271daea..d91e8e0 100644 --- a/app/src/main/java/com/dskj/rbchat/model/HisChatShowBean.java +++ b/app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import com.netease.yunxin.kit.chatkit.model.IMMessageInfo; diff --git a/app/src/main/java/com/dskj/rbchat/model/InstallmentBean.java b/app/src/main/java/com/hbl/lewan/model/InstallmentBean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/InstallmentBean.java rename to app/src/main/java/com/hbl/lewan/model/InstallmentBean.java index bf0120b..6b2e9e8 100644 --- a/app/src/main/java/com/dskj/rbchat/model/InstallmentBean.java +++ b/app/src/main/java/com/hbl/lewan/model/InstallmentBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/InviteDetailsBean.java b/app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/InviteDetailsBean.java rename to app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java index 4dc76fa..d3077a8 100644 --- a/app/src/main/java/com/dskj/rbchat/model/InviteDetailsBean.java +++ b/app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; diff --git a/app/src/main/java/com/dskj/rbchat/model/JsBridgeOrderBean.java b/app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/JsBridgeOrderBean.java rename to app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java index f3301d2..bbf0780 100644 --- a/app/src/main/java/com/dskj/rbchat/model/JsBridgeOrderBean.java +++ b/app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class JsBridgeOrderBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/LikeBean.java b/app/src/main/java/com/hbl/lewan/model/LikeBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/LikeBean.java rename to app/src/main/java/com/hbl/lewan/model/LikeBean.java index ac7ad18..8374fc1 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LikeBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LikeBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/LinkBean.java b/app/src/main/java/com/hbl/lewan/model/LinkBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/LinkBean.java rename to app/src/main/java/com/hbl/lewan/model/LinkBean.java index 827728e..55f9508 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LinkBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LinkBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class LinkBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/ListBeanResult.java b/app/src/main/java/com/hbl/lewan/model/ListBeanResult.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/ListBeanResult.java rename to app/src/main/java/com/hbl/lewan/model/ListBeanResult.java index efc3d74..4a46696 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ListBeanResult.java +++ b/app/src/main/java/com/hbl/lewan/model/ListBeanResult.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/LngLat.java b/app/src/main/java/com/hbl/lewan/model/LngLat.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/model/LngLat.java rename to app/src/main/java/com/hbl/lewan/model/LngLat.java index 4160e5d..734877d 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LngLat.java +++ b/app/src/main/java/com/hbl/lewan/model/LngLat.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class LngLat { public double longitude; diff --git a/app/src/main/java/com/dskj/rbchat/model/LoginBean.java b/app/src/main/java/com/hbl/lewan/model/LoginBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/LoginBean.java rename to app/src/main/java/com/hbl/lewan/model/LoginBean.java index d734c62..39b0e2d 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LoginBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LoginBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class LoginBean extends RosterElementEntity { diff --git a/app/src/main/java/com/dskj/rbchat/model/LoginBeanJiaXu.java b/app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/model/LoginBeanJiaXu.java rename to app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java index 74c0e9b..5e2b82f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LoginBeanJiaXu.java +++ b/app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class LoginBeanJiaXu { private String loginUrl; diff --git a/app/src/main/java/com/dskj/rbchat/model/LoginUserBean.java b/app/src/main/java/com/hbl/lewan/model/LoginUserBean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/LoginUserBean.java rename to app/src/main/java/com/hbl/lewan/model/LoginUserBean.java index a459fc2..c2c6334 100644 --- a/app/src/main/java/com/dskj/rbchat/model/LoginUserBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LoginUserBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class LoginUserBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/Message54Bean.java b/app/src/main/java/com/hbl/lewan/model/Message54Bean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/Message54Bean.java rename to app/src/main/java/com/hbl/lewan/model/Message54Bean.java index 6451535..9f9184b 100644 --- a/app/src/main/java/com/dskj/rbchat/model/Message54Bean.java +++ b/app/src/main/java/com/hbl/lewan/model/Message54Bean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/MessageAtQuBean.java b/app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/model/MessageAtQuBean.java rename to app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java index b9c3bc9..416ce43 100644 --- a/app/src/main/java/com/dskj/rbchat/model/MessageAtQuBean.java +++ b/app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class MessageAtQuBean { private String content; diff --git a/app/src/main/java/com/dskj/rbchat/model/MessageBean.java b/app/src/main/java/com/hbl/lewan/model/MessageBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/MessageBean.java rename to app/src/main/java/com/hbl/lewan/model/MessageBean.java index c2c62d0..993a805 100644 --- a/app/src/main/java/com/dskj/rbchat/model/MessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/MessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class MessageBean{ diff --git a/app/src/main/java/com/dskj/rbchat/model/MessagefcmBean.java b/app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/MessagefcmBean.java rename to app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java index aeef238..72a17cb 100644 --- a/app/src/main/java/com/dskj/rbchat/model/MessagefcmBean.java +++ b/app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class MessagefcmBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/NearbySearchBean.java b/app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/NearbySearchBean.java rename to app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java index f96e6e1..4428a23 100644 --- a/app/src/main/java/com/dskj/rbchat/model/NearbySearchBean.java +++ b/app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/NewsBean.java b/app/src/main/java/com/hbl/lewan/model/NewsBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/NewsBean.java rename to app/src/main/java/com/hbl/lewan/model/NewsBean.java index c00d67f..ca4fbfa 100644 --- a/app/src/main/java/com/dskj/rbchat/model/NewsBean.java +++ b/app/src/main/java/com/hbl/lewan/model/NewsBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/NotifyCountBean.java b/app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/NotifyCountBean.java rename to app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java index a345a69..a2ad494 100644 --- a/app/src/main/java/com/dskj/rbchat/model/NotifyCountBean.java +++ b/app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import android.print.PageRange; diff --git a/app/src/main/java/com/dskj/rbchat/model/NotifyExtraBean.java b/app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/model/NotifyExtraBean.java rename to app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java index c890435..165dfa4 100644 --- a/app/src/main/java/com/dskj/rbchat/model/NotifyExtraBean.java +++ b/app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/OauthAppBean.java b/app/src/main/java/com/hbl/lewan/model/OauthAppBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/OauthAppBean.java rename to app/src/main/java/com/hbl/lewan/model/OauthAppBean.java index 9d0a4b6..3ae50dd 100644 --- a/app/src/main/java/com/dskj/rbchat/model/OauthAppBean.java +++ b/app/src/main/java/com/hbl/lewan/model/OauthAppBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class OauthAppBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/PassWordLoginBean.java b/app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/PassWordLoginBean.java rename to app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java index 36f6265..94cfb2a 100644 --- a/app/src/main/java/com/dskj/rbchat/model/PassWordLoginBean.java +++ b/app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class PassWordLoginBean { private String phone; diff --git a/app/src/main/java/com/dskj/rbchat/model/PayInfoBean.java b/app/src/main/java/com/hbl/lewan/model/PayInfoBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/PayInfoBean.java rename to app/src/main/java/com/hbl/lewan/model/PayInfoBean.java index ecea7e3..88d9ce3 100644 --- a/app/src/main/java/com/dskj/rbchat/model/PayInfoBean.java +++ b/app/src/main/java/com/hbl/lewan/model/PayInfoBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class PayInfoBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/PushBean.java b/app/src/main/java/com/hbl/lewan/model/PushBean.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/PushBean.java rename to app/src/main/java/com/hbl/lewan/model/PushBean.java index f8b57c1..1a0705f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/PushBean.java +++ b/app/src/main/java/com/hbl/lewan/model/PushBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/QuesBean.java b/app/src/main/java/com/hbl/lewan/model/QuesBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/QuesBean.java rename to app/src/main/java/com/hbl/lewan/model/QuesBean.java index 49d50f9..a1f3a0d 100644 --- a/app/src/main/java/com/dskj/rbchat/model/QuesBean.java +++ b/app/src/main/java/com/hbl/lewan/model/QuesBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/QuesListBean.java b/app/src/main/java/com/hbl/lewan/model/QuesListBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/QuesListBean.java rename to app/src/main/java/com/hbl/lewan/model/QuesListBean.java index 2ae4250..5f48103 100644 --- a/app/src/main/java/com/dskj/rbchat/model/QuesListBean.java +++ b/app/src/main/java/com/hbl/lewan/model/QuesListBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/QuestionBean.java b/app/src/main/java/com/hbl/lewan/model/QuestionBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/QuestionBean.java rename to app/src/main/java/com/hbl/lewan/model/QuestionBean.java index 4adf09b..90d9b69 100644 --- a/app/src/main/java/com/dskj/rbchat/model/QuestionBean.java +++ b/app/src/main/java/com/hbl/lewan/model/QuestionBean.java @@ -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 { diff --git a/app/src/main/java/com/dskj/rbchat/model/QuoteMessageBean.java b/app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/QuoteMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java index 0a3209d..e7fa290 100644 --- a/app/src/main/java/com/dskj/rbchat/model/QuoteMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/ReadBean.java b/app/src/main/java/com/hbl/lewan/model/ReadBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/ReadBean.java rename to app/src/main/java/com/hbl/lewan/model/ReadBean.java index d17ddc4..d8554e7 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ReadBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ReadBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; diff --git a/app/src/main/java/com/dskj/rbchat/model/ReadMessageBean.java b/app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/model/ReadMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java index 2390edd..0a295c7 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ReadMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/ReadRxBusBean.java b/app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/model/ReadRxBusBean.java rename to app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java index fe03df0..09f3c6f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ReadRxBusBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class ReadRxBusBean { public int type; diff --git a/app/src/main/java/com/dskj/rbchat/model/RebootMessageBean.java b/app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/model/RebootMessageBean.java rename to app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java index 04f1f1b..30662ea 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RebootMessageBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RebootMessageBean { private String content; diff --git a/app/src/main/java/com/dskj/rbchat/model/RefreshTokenBean.java b/app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/model/RefreshTokenBean.java rename to app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java index 71d6c8b..b162d4a 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RefreshTokenBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RefreshTokenBean { private String refreshToken; diff --git a/app/src/main/java/com/dskj/rbchat/model/RegisteredBean.java b/app/src/main/java/com/hbl/lewan/model/RegisteredBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/RegisteredBean.java rename to app/src/main/java/com/hbl/lewan/model/RegisteredBean.java index 9b4d2c9..fe4f527 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RegisteredBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RegisteredBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RegisteredBean { private boolean registered; diff --git a/app/src/main/java/com/dskj/rbchat/model/ReportBean.java b/app/src/main/java/com/hbl/lewan/model/ReportBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/ReportBean.java rename to app/src/main/java/com/hbl/lewan/model/ReportBean.java index c2ebf99..99c8c04 100644 --- a/app/src/main/java/com/dskj/rbchat/model/ReportBean.java +++ b/app/src/main/java/com/hbl/lewan/model/ReportBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class ReportBean { private int index; diff --git a/app/src/main/java/com/dskj/rbchat/model/RosterElementEntity.java b/app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/RosterElementEntity.java rename to app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java index 6b7aeec..7f65cf5 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RosterElementEntity.java +++ b/app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/RtcTokenBean.java b/app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/RtcTokenBean.java rename to app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java index adab097..2b9ecdb 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RtcTokenBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RtcTokenBean { private int role; diff --git a/app/src/main/java/com/dskj/rbchat/model/RtcTokenResBean.java b/app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/RtcTokenResBean.java rename to app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java index 9b45a92..71a1ad6 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RtcTokenResBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RtcTokenResBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/RxBusEditMessage.java b/app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/RxBusEditMessage.java rename to app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java index 6031d74..b57eec9 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RxBusEditMessage.java +++ b/app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RxBusEditMessage { private String toUid; diff --git a/app/src/main/java/com/dskj/rbchat/model/RxBusLoadMoreListBean.java b/app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java similarity index 89% rename from app/src/main/java/com/dskj/rbchat/model/RxBusLoadMoreListBean.java rename to app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java index d299112..4f2ee8e 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RxBusLoadMoreListBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RxBusLoadMoreListBean { private int type; diff --git a/app/src/main/java/com/dskj/rbchat/model/RxCommLikeBean.java b/app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/RxCommLikeBean.java rename to app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java index 119c3e3..a6514aa 100644 --- a/app/src/main/java/com/dskj/rbchat/model/RxCommLikeBean.java +++ b/app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class RxCommLikeBean { private String postId; diff --git a/app/src/main/java/com/dskj/rbchat/model/SearchBean.java b/app/src/main/java/com/hbl/lewan/model/SearchBean.java similarity index 90% rename from app/src/main/java/com/dskj/rbchat/model/SearchBean.java rename to app/src/main/java/com/hbl/lewan/model/SearchBean.java index f07fc6a..e5ac0a4 100644 --- a/app/src/main/java/com/dskj/rbchat/model/SearchBean.java +++ b/app/src/main/java/com/hbl/lewan/model/SearchBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class SearchBean { public String searchText; diff --git a/app/src/main/java/com/dskj/rbchat/model/SendOrderBean.java b/app/src/main/java/com/hbl/lewan/model/SendOrderBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/SendOrderBean.java rename to app/src/main/java/com/hbl/lewan/model/SendOrderBean.java index f5d27c4..7a97a42 100644 --- a/app/src/main/java/com/dskj/rbchat/model/SendOrderBean.java +++ b/app/src/main/java/com/hbl/lewan/model/SendOrderBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/dskj/rbchat/model/SetUpdatesBean.java b/app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/SetUpdatesBean.java rename to app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java index 812234b..f1644fc 100644 --- a/app/src/main/java/com/dskj/rbchat/model/SetUpdatesBean.java +++ b/app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/StaffServiceIdBean.java b/app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/StaffServiceIdBean.java rename to app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java index 6d02f91..bbbea57 100644 --- a/app/src/main/java/com/dskj/rbchat/model/StaffServiceIdBean.java +++ b/app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class StaffServiceIdBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/StatisticsBean.java b/app/src/main/java/com/hbl/lewan/model/StatisticsBean.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/model/StatisticsBean.java rename to app/src/main/java/com/hbl/lewan/model/StatisticsBean.java index af1724b..6e1212f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/StatisticsBean.java +++ b/app/src/main/java/com/hbl/lewan/model/StatisticsBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class StatisticsBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/StsCredentialsBean.java b/app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/StsCredentialsBean.java rename to app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java index 18a82dd..8280b3a 100644 --- a/app/src/main/java/com/dskj/rbchat/model/StsCredentialsBean.java +++ b/app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class StsCredentialsBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/SystemResultBean.java b/app/src/main/java/com/hbl/lewan/model/SystemResultBean.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/SystemResultBean.java rename to app/src/main/java/com/hbl/lewan/model/SystemResultBean.java index f46c32f..b6d0794 100644 --- a/app/src/main/java/com/dskj/rbchat/model/SystemResultBean.java +++ b/app/src/main/java/com/hbl/lewan/model/SystemResultBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class SystemResultBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/TaskBean.java b/app/src/main/java/com/hbl/lewan/model/TaskBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/TaskBean.java rename to app/src/main/java/com/hbl/lewan/model/TaskBean.java index fb808b9..06c6834 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TaskBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TaskBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class TaskBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/TeamUpdateEvent.java b/app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/model/TeamUpdateEvent.java rename to app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java index 65cd474..99c9868 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TeamUpdateEvent.java +++ b/app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dskj/rbchat/model/TimeBean.java b/app/src/main/java/com/hbl/lewan/model/TimeBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/TimeBean.java rename to app/src/main/java/com/hbl/lewan/model/TimeBean.java index 128bf19..6b77411 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TimeBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TimeBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/TopBean.java b/app/src/main/java/com/hbl/lewan/model/TopBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/TopBean.java rename to app/src/main/java/com/hbl/lewan/model/TopBean.java index 804a265..2950d8e 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TopBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TopBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/TopOrderBean.java b/app/src/main/java/com/hbl/lewan/model/TopOrderBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/TopOrderBean.java rename to app/src/main/java/com/hbl/lewan/model/TopOrderBean.java index 18a0c55..8cd14f9 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TopOrderBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TopOrderBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; diff --git a/app/src/main/java/com/dskj/rbchat/model/TopUpBean.java b/app/src/main/java/com/hbl/lewan/model/TopUpBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/TopUpBean.java rename to app/src/main/java/com/hbl/lewan/model/TopUpBean.java index 10fbc3c..26d35e1 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TopUpBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TopUpBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class TopUpBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/TransferMoneyBean.java b/app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/TransferMoneyBean.java rename to app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java index dac193d..17f4455 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TransferMoneyBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; /** * 转账记录 diff --git a/app/src/main/java/com/dskj/rbchat/model/TrcGroupBean.java b/app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/TrcGroupBean.java rename to app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java index 0dcba33..43b1721 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TrcGroupBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class TrcGroupBean { private int rtcType; diff --git a/app/src/main/java/com/dskj/rbchat/model/TypeBean.java b/app/src/main/java/com/hbl/lewan/model/TypeBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/TypeBean.java rename to app/src/main/java/com/hbl/lewan/model/TypeBean.java index cf835d6..27ba2b6 100644 --- a/app/src/main/java/com/dskj/rbchat/model/TypeBean.java +++ b/app/src/main/java/com/hbl/lewan/model/TypeBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/UserAlbumBean.java b/app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/UserAlbumBean.java rename to app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java index 9ab0406..65f6663 100644 --- a/app/src/main/java/com/dskj/rbchat/model/UserAlbumBean.java +++ b/app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/dskj/rbchat/model/UserRankBean.java b/app/src/main/java/com/hbl/lewan/model/UserRankBean.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/model/UserRankBean.java rename to app/src/main/java/com/hbl/lewan/model/UserRankBean.java index 0def6bf..f687f0c 100644 --- a/app/src/main/java/com/dskj/rbchat/model/UserRankBean.java +++ b/app/src/main/java/com/hbl/lewan/model/UserRankBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class UserRankBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/UserShareBean.java b/app/src/main/java/com/hbl/lewan/model/UserShareBean.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/model/UserShareBean.java rename to app/src/main/java/com/hbl/lewan/model/UserShareBean.java index 9889172..2bfd241 100644 --- a/app/src/main/java/com/dskj/rbchat/model/UserShareBean.java +++ b/app/src/main/java/com/hbl/lewan/model/UserShareBean.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/model/UserUpdateEvent.java b/app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/model/UserUpdateEvent.java rename to app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java index 856b89a..cf0097f 100644 --- a/app/src/main/java/com/dskj/rbchat/model/UserUpdateEvent.java +++ b/app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dskj/rbchat/model/UsersExistBean.java b/app/src/main/java/com/hbl/lewan/model/UsersExistBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/UsersExistBean.java rename to app/src/main/java/com/hbl/lewan/model/UsersExistBean.java index ea379a6..001e1cd 100644 --- a/app/src/main/java/com/dskj/rbchat/model/UsersExistBean.java +++ b/app/src/main/java/com/hbl/lewan/model/UsersExistBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class UsersExistBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/VersionBean.java b/app/src/main/java/com/hbl/lewan/model/VersionBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/VersionBean.java rename to app/src/main/java/com/hbl/lewan/model/VersionBean.java index 5ba0af1..aa55d3a 100644 --- a/app/src/main/java/com/dskj/rbchat/model/VersionBean.java +++ b/app/src/main/java/com/hbl/lewan/model/VersionBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class VersionBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/WalletBean.java b/app/src/main/java/com/hbl/lewan/model/WalletBean.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/model/WalletBean.java rename to app/src/main/java/com/hbl/lewan/model/WalletBean.java index 6d41920..fd8632c 100644 --- a/app/src/main/java/com/dskj/rbchat/model/WalletBean.java +++ b/app/src/main/java/com/hbl/lewan/model/WalletBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class WalletBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/WithCashBean.java b/app/src/main/java/com/hbl/lewan/model/WithCashBean.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/model/WithCashBean.java rename to app/src/main/java/com/hbl/lewan/model/WithCashBean.java index 2300ae5..67414ac 100644 --- a/app/src/main/java/com/dskj/rbchat/model/WithCashBean.java +++ b/app/src/main/java/com/hbl/lewan/model/WithCashBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class WithCashBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/WithdrawCashBean.java b/app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/model/WithdrawCashBean.java rename to app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java index bdacb75..5df9079 100644 --- a/app/src/main/java/com/dskj/rbchat/model/WithdrawCashBean.java +++ b/app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class WithdrawCashBean { diff --git a/app/src/main/java/com/dskj/rbchat/model/WorldChatBean.java b/app/src/main/java/com/hbl/lewan/model/WorldChatBean.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/model/WorldChatBean.java rename to app/src/main/java/com/hbl/lewan/model/WorldChatBean.java index edac89a..109534b 100644 --- a/app/src/main/java/com/dskj/rbchat/model/WorldChatBean.java +++ b/app/src/main/java/com/hbl/lewan/model/WorldChatBean.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.model; +package com.hbl.lewan.model; public class WorldChatBean { diff --git a/app/src/main/java/com/dskj/rbchat/network/Api.java b/app/src/main/java/com/hbl/lewan/network/Api.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/network/Api.java rename to app/src/main/java/com/hbl/lewan/network/Api.java index 6051db9..33d10af 100644 --- a/app/src/main/java/com/dskj/rbchat/network/Api.java +++ b/app/src/main/java/com/hbl/lewan/network/Api.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/network/ApiService.java b/app/src/main/java/com/hbl/lewan/network/ApiService.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/network/ApiService.java rename to app/src/main/java/com/hbl/lewan/network/ApiService.java index f6acd7d..a4b7336 100644 --- a/app/src/main/java/com/dskj/rbchat/network/ApiService.java +++ b/app/src/main/java/com/hbl/lewan/network/ApiService.java @@ -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> stsCredentials(); - + @GET("/file/stsCredentials") + Observable> stsCredentials1(); // @POST(Const.TESTTOY_SAVE_USER_MACHINE) // Observable save_user_machine(@Body Map requestBody); diff --git a/app/src/main/java/com/dskj/rbchat/network/BaseApi.java b/app/src/main/java/com/hbl/lewan/network/BaseApi.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/network/BaseApi.java rename to app/src/main/java/com/hbl/lewan/network/BaseApi.java index cc66017..d2fd253 100644 --- a/app/src/main/java/com/dskj/rbchat/network/BaseApi.java +++ b/app/src/main/java/com/hbl/lewan/network/BaseApi.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.network; +package com.hbl.lewan.network; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/com/dskj/rbchat/network/BaseObserver.java b/app/src/main/java/com/hbl/lewan/network/BaseObserver.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/network/BaseObserver.java rename to app/src/main/java/com/hbl/lewan/network/BaseObserver.java index 2d3ca2e..84e65e4 100644 --- a/app/src/main/java/com/dskj/rbchat/network/BaseObserver.java +++ b/app/src/main/java/com/hbl/lewan/network/BaseObserver.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/network/BaseObserver1.java b/app/src/main/java/com/hbl/lewan/network/BaseObserver1.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/network/BaseObserver1.java rename to app/src/main/java/com/hbl/lewan/network/BaseObserver1.java index ecceeda..72aaed6 100644 --- a/app/src/main/java/com/dskj/rbchat/network/BaseObserver1.java +++ b/app/src/main/java/com/hbl/lewan/network/BaseObserver1.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.network; +package com.hbl.lewan.network; import com.google.gson.JsonParseException; diff --git a/app/src/main/java/com/dskj/rbchat/network/BaseObserverNew.java b/app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/network/BaseObserverNew.java rename to app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java index 6a1794e..996e198 100644 --- a/app/src/main/java/com/dskj/rbchat/network/BaseObserverNew.java +++ b/app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/network/HeaderInterceptor.java b/app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/network/HeaderInterceptor.java rename to app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java index 72f624e..4989123 100644 --- a/app/src/main/java/com/dskj/rbchat/network/HeaderInterceptor.java +++ b/app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/network/Result.java b/app/src/main/java/com/hbl/lewan/network/Result.java similarity index 87% rename from app/src/main/java/com/dskj/rbchat/network/Result.java rename to app/src/main/java/com/hbl/lewan/network/Result.java index 4dd9f48..3783207 100644 --- a/app/src/main/java/com/dskj/rbchat/network/Result.java +++ b/app/src/main/java/com/hbl/lewan/network/Result.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/network/ResultNew.java b/app/src/main/java/com/hbl/lewan/network/ResultNew.java similarity index 86% rename from app/src/main/java/com/dskj/rbchat/network/ResultNew.java rename to app/src/main/java/com/hbl/lewan/network/ResultNew.java index 0e55aec..99a0896 100644 --- a/app/src/main/java/com/dskj/rbchat/network/ResultNew.java +++ b/app/src/main/java/com/hbl/lewan/network/ResultNew.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/CollectionActivity.java b/app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/pay/CollectionActivity.java rename to app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java index 2ef7aa8..7968b6b 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/CollectionActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/CollectionAndPaymentActivity.java b/app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/pay/CollectionAndPaymentActivity.java rename to app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java index 5b72739..1af6afa 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/CollectionAndPaymentActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanActivity.java b/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanActivity.java rename to app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java index aadd88e..55a0585 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanSuccessActivity.java b/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanSuccessActivity.java rename to app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java index 062360d..3f731ed 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/LipinDuiHuanSuccessActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/NfcReaderActivity.java b/app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/pay/NfcReaderActivity.java rename to app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java index f6c8f6c..dc39ae6 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/NfcReaderActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java @@ -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); diff --git a/app/src/main/java/com/dskj/rbchat/pay/PaymentActivity.java b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/pay/PaymentActivity.java rename to app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java index c8a60ba..1e52cb5 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/PaymentActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/PaymentActivity1.java b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/pay/PaymentActivity1.java rename to app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java index eb869ac..d2b8b2e 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/PaymentActivity1.java +++ b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/pay/PaymentSuccessActivity.java b/app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/pay/PaymentSuccessActivity.java rename to app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java index b0a5ccc..feb22c1 100644 --- a/app/src/main/java/com/dskj/rbchat/pay/PaymentSuccessActivity.java +++ b/app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/push/HWPushMessageService.java b/app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java similarity index 88% rename from app/src/main/java/com/dskj/rbchat/push/HWPushMessageService.java rename to app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java index 7518902..7106aac 100644 --- a/app/src/main/java/com/dskj/rbchat/push/HWPushMessageService.java +++ b/app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java @@ -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 { diff --git a/app/src/main/java/com/dskj/rbchat/push/PushMessageHandler.java b/app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/push/PushMessageHandler.java rename to app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java index 3620fd2..45e8a9f 100644 --- a/app/src/main/java/com/dskj/rbchat/push/PushMessageHandler.java +++ b/app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/push/PushUserInfoProvider.java b/app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/push/PushUserInfoProvider.java rename to app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java index 23c57f6..885c98c 100644 --- a/app/src/main/java/com/dskj/rbchat/push/PushUserInfoProvider.java +++ b/app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; diff --git a/app/src/main/java/com/dskj/rbchat/redpack/ReceiveRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/redpack/ReceiveRedPacketActivity.java rename to app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java index e302520..7b71c57 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/ReceiveRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/redpack/SendGiftRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/redpack/SendGiftRedPacketActivity.java rename to app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java index b3fba64..cef5980 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/SendGiftRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/redpack/SendRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/redpack/SendRedPacketActivity.java rename to app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java index 93ee0ad..4cc51a2 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/SendRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java @@ -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); diff --git a/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java similarity index 91% rename from app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java rename to app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java index 0c999e9..560b153 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/redpack/TransferInfoActivity.java b/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/redpack/TransferInfoActivity.java rename to app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java index 852e66c..d520abf 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/TransferInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/repository/LoginUserRepository.java b/app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java similarity index 85% rename from app/src/main/java/com/dskj/rbchat/repository/LoginUserRepository.java rename to app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java index 090edb9..e940a1f 100644 --- a/app/src/main/java/com/dskj/rbchat/repository/LoginUserRepository.java +++ b/app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/utils/AdaptScreenUtils.java b/app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/utils/AdaptScreenUtils.java rename to app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java index 4e30dcf..68b1c52 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/AdaptScreenUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java @@ -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; diff --git a/app/src/main/java/com/dskj/rbchat/utils/AnimUtil.java b/app/src/main/java/com/hbl/lewan/utils/AnimUtil.java similarity index 57% rename from app/src/main/java/com/dskj/rbchat/utils/AnimUtil.java rename to app/src/main/java/com/hbl/lewan/utils/AnimUtil.java index 4a90f4a..923ffb0 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/AnimUtil.java +++ b/app/src/main/java/com/hbl/lewan/utils/AnimUtil.java @@ -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); } } } diff --git a/app/src/main/java/com/dskj/rbchat/utils/AppUtils.java b/app/src/main/java/com/hbl/lewan/utils/AppUtils.java similarity index 76% rename from app/src/main/java/com/dskj/rbchat/utils/AppUtils.java rename to app/src/main/java/com/hbl/lewan/utils/AppUtils.java index ff3b63c..14eb52c 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/AppUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/AppUtils.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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); } diff --git a/app/src/main/java/com/dskj/rbchat/utils/CharInputFilter.java b/app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java similarity index 95% rename from app/src/main/java/com/dskj/rbchat/utils/CharInputFilter.java rename to app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java index 25a6ea8..34f5198 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/CharInputFilter.java +++ b/app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import android.text.InputFilter; import android.text.Spanned; diff --git a/app/src/main/java/com/dskj/rbchat/utils/CommonUtils.java b/app/src/main/java/com/hbl/lewan/utils/CommonUtils.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/utils/CommonUtils.java rename to app/src/main/java/com/hbl/lewan/utils/CommonUtils.java index a2fef9d..a71806c 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/CommonUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import java.lang.reflect.Method; import java.math.BigDecimal; diff --git a/app/src/main/java/com/dskj/rbchat/utils/Constant.java b/app/src/main/java/com/hbl/lewan/utils/Constant.java similarity index 97% rename from app/src/main/java/com/dskj/rbchat/utils/Constant.java rename to app/src/main/java/com/hbl/lewan/utils/Constant.java index d9a5bf6..dba5e7e 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/Constant.java +++ b/app/src/main/java/com/hbl/lewan/utils/Constant.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; public class Constant { diff --git a/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java b/app/src/main/java/com/hbl/lewan/utils/DataUtils.java similarity index 96% rename from app/src/main/java/com/dskj/rbchat/utils/DataUtils.java rename to app/src/main/java/com/hbl/lewan/utils/DataUtils.java index 3cd937a..c5ee2cc 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/DataUtils.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.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; // } // } - return new CountryBean("+86", context.getString(R.string.zhongguo_txt)); + 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)); + } } diff --git a/app/src/main/java/com/dskj/rbchat/utils/DateUtil.java b/app/src/main/java/com/hbl/lewan/utils/DateUtil.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/utils/DateUtil.java rename to app/src/main/java/com/hbl/lewan/utils/DateUtil.java index 86b641d..3f4fcb6 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/DateUtil.java +++ b/app/src/main/java/com/hbl/lewan/utils/DateUtil.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/dskj/rbchat/utils/FileUtils.java b/app/src/main/java/com/hbl/lewan/utils/FileUtils.java similarity index 64% rename from app/src/main/java/com/dskj/rbchat/utils/FileUtils.java rename to app/src/main/java/com/hbl/lewan/utils/FileUtils.java index 0130f85..29c37c9 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/FileUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/FileUtils.java @@ -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 + } + } diff --git a/app/src/main/java/com/dskj/rbchat/utils/GetAndroidUniqueMark.java b/app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/utils/GetAndroidUniqueMark.java rename to app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java index 968ab3f..b9e755a 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/GetAndroidUniqueMark.java +++ b/app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/dskj/rbchat/utils/GsonUtils.java b/app/src/main/java/com/hbl/lewan/utils/GsonUtils.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/utils/GsonUtils.java rename to app/src/main/java/com/hbl/lewan/utils/GsonUtils.java index ad8b5c4..7629038 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/GsonUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/GsonUtils.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/dskj/rbchat/utils/ImageCacheLoader.java b/app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/utils/ImageCacheLoader.java rename to app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java index cffe048..b860180 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/ImageCacheLoader.java +++ b/app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java @@ -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; /** diff --git a/app/src/main/java/com/dskj/rbchat/utils/ImageLoader.java b/app/src/main/java/com/hbl/lewan/utils/ImageLoader.java similarity index 92% rename from app/src/main/java/com/dskj/rbchat/utils/ImageLoader.java rename to app/src/main/java/com/hbl/lewan/utils/ImageLoader.java index 2ece2e5..8378060 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/ImageLoader.java +++ b/app/src/main/java/com/hbl/lewan/utils/ImageLoader.java @@ -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. diff --git a/app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelper.java b/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java similarity index 94% rename from app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelper.java rename to app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java index 420d98d..bfbd418 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelper.java +++ b/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelperCallback.java b/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelperCallback.java rename to app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java index 07213c9..ddcb269 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/ItemDragTouchHelperCallback.java +++ b/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/dskj/rbchat/utils/KeyboardUtil.java b/app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/utils/KeyboardUtil.java rename to app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java index d3b5d2f..f9cd4e8 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/KeyboardUtil.java +++ b/app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java @@ -1,4 +1,4 @@ -package com.dskj.rbchat.utils; +package com.hbl.lewan.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/dskj/rbchat/utils/LogUtils.java b/app/src/main/java/com/hbl/lewan/utils/LogUtils.java similarity index 98% rename from app/src/main/java/com/dskj/rbchat/utils/LogUtils.java rename to app/src/main/java/com/hbl/lewan/utils/LogUtils.java index 2bfb325..01dd50e 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/LogUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/LogUtils.java @@ -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; /** diff --git a/app/src/main/java/com/dskj/rbchat/utils/QRCodeScheme.java b/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java similarity index 93% rename from app/src/main/java/com/dskj/rbchat/utils/QRCodeScheme.java rename to app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java index a84ec4e..2e14013 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/QRCodeScheme.java +++ b/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java @@ -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); diff --git a/app/src/main/java/com/dskj/rbchat/utils/ScreenUtils.java b/app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java similarity index 99% rename from app/src/main/java/com/dskj/rbchat/utils/ScreenUtils.java rename to app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java index fde4804..cfdc9dd 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/ScreenUtils.java +++ b/app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java @@ -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; /** * 

diff --git a/app/src/main/java/com/dskj/rbchat/utils/ShareDateUtils.java b/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
similarity index 97%
rename from app/src/main/java/com/dskj/rbchat/utils/ShareDateUtils.java
rename to app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
index 770cc88..ae69951 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/ShareDateUtils.java
+++ b/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
@@ -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;
diff --git a/app/src/main/java/com/dskj/rbchat/utils/SoftHideKeyBoardUtil.java b/app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java
similarity index 99%
rename from app/src/main/java/com/dskj/rbchat/utils/SoftHideKeyBoardUtil.java
rename to app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java
index 06b1553..9db84ae 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/SoftHideKeyBoardUtil.java
+++ b/app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.utils;
+package com.hbl.lewan.utils;
 
 import android.app.Activity;
 import android.graphics.Rect;
diff --git a/app/src/main/java/com/dskj/rbchat/utils/StickyTopicScroller.java b/app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java
similarity index 96%
rename from app/src/main/java/com/dskj/rbchat/utils/StickyTopicScroller.java
rename to app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java
index 24b32a3..1d21743 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/StickyTopicScroller.java
+++ b/app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.utils;
+package com.hbl.lewan.utils;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
diff --git a/app/src/main/java/com/dskj/rbchat/utils/TaiWanIDCardUtils.java b/app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java
similarity index 98%
rename from app/src/main/java/com/dskj/rbchat/utils/TaiWanIDCardUtils.java
rename to app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java
index a04794b..3cdad07 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/TaiWanIDCardUtils.java
+++ b/app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.utils;
+package com.hbl.lewan.utils;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/dskj/rbchat/utils/ToolKits.java b/app/src/main/java/com/hbl/lewan/utils/ToolKits.java
similarity index 99%
rename from app/src/main/java/com/dskj/rbchat/utils/ToolKits.java
rename to app/src/main/java/com/hbl/lewan/utils/ToolKits.java
index b72a554..8367af9 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/ToolKits.java
+++ b/app/src/main/java/com/hbl/lewan/utils/ToolKits.java
@@ -1,5 +1,5 @@
 
-package com.dskj.rbchat.utils;
+package com.hbl.lewan.utils;
 
 import android.app.Activity;
 import android.content.ClipData;
diff --git a/app/src/main/java/com/dskj/rbchat/utils/play/AmountBean.java b/app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java
similarity index 92%
rename from app/src/main/java/com/dskj/rbchat/utils/play/AmountBean.java
rename to app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java
index 5b0f13a..39329c6 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/play/AmountBean.java
+++ b/app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.utils.play;
+package com.hbl.lewan.utils.play;
 
 public class AmountBean {
 
diff --git a/app/src/main/java/com/dskj/rbchat/utils/play/PlaySound.java b/app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java
similarity index 99%
rename from app/src/main/java/com/dskj/rbchat/utils/play/PlaySound.java
rename to app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java
index 1696a4e..86ba62a 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/play/PlaySound.java
+++ b/app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.utils.play;
+package com.hbl.lewan.utils.play;
 
 
 public class PlaySound {
diff --git a/app/src/main/java/com/dskj/rbchat/utils/play/VoiceUtils.java b/app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java
similarity index 98%
rename from app/src/main/java/com/dskj/rbchat/utils/play/VoiceUtils.java
rename to app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java
index 9f08d92..31cd910 100644
--- a/app/src/main/java/com/dskj/rbchat/utils/play/VoiceUtils.java
+++ b/app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java
@@ -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;
diff --git a/app/src/main/java/com/dskj/rbchat/voom/CircleFragment.java b/app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
similarity index 83%
rename from app/src/main/java/com/dskj/rbchat/voom/CircleFragment.java
rename to app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
index b5c5da7..8486cf0 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/CircleFragment.java
+++ b/app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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 titles = new ArrayList<>();
     static CommonAdapter commonAdapter;
     private int categoryId;
     StaggeredGridLayoutManager linearLayoutManager;
     protected ActivityResultLauncher 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/"));
-                                } 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, s.getPicture1());
                             } 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);
diff --git a/app/src/main/java/com/dskj/rbchat/voom/CirclePicFragment.java b/app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java
similarity index 92%
rename from app/src/main/java/com/dskj/rbchat/voom/CirclePicFragment.java
rename to app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java
index 8b08873..9b8b049 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/CirclePicFragment.java
+++ b/app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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;
 
diff --git a/app/src/main/java/com/dskj/rbchat/voom/CommentFragment.java b/app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
similarity index 94%
rename from app/src/main/java/com/dskj/rbchat/voom/CommentFragment.java
rename to app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
index 4f1ebc7..7d6273d 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/CommentFragment.java
+++ b/app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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 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() {
                     @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);
 
                     }
diff --git a/app/src/main/java/com/dskj/rbchat/voom/LikeFragment.java b/app/src/main/java/com/hbl/lewan/voom/LikeFragment.java
similarity index 92%
rename from app/src/main/java/com/dskj/rbchat/voom/LikeFragment.java
rename to app/src/main/java/com/hbl/lewan/voom/LikeFragment.java
index cb30bbd..1d9346c 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/LikeFragment.java
+++ b/app/src/main/java/com/hbl/lewan/voom/LikeFragment.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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;
diff --git a/app/src/main/java/com/dskj/rbchat/voom/MessageActivity.java b/app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
similarity index 94%
rename from app/src/main/java/com/dskj/rbchat/voom/MessageActivity.java
rename to app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
index d3f7848..97ff9f8 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/MessageActivity.java
+++ b/app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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);
diff --git a/app/src/main/java/com/dskj/rbchat/voom/PushActivity.java b/app/src/main/java/com/hbl/lewan/voom/PushActivity.java
similarity index 74%
rename from app/src/main/java/com/dskj/rbchat/voom/PushActivity.java
rename to app/src/main/java/com/hbl/lewan/voom/PushActivity.java
index 1c8b675..6e17cf6 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/PushActivity.java
+++ b/app/src/main/java/com/hbl/lewan/voom/PushActivity.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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,117 +283,218 @@ 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>() {
+//                    @Override
+//                    public void onSuccess(Result 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>() {
+                .subscribe(new BaseObserver<>() {
                     @Override
-                    public void onSuccess(Result feedbackResp) {
-                        stsCredentialsBean = feedbackResp.data;
-                        toAliYunOss();
+                    public void onSuccess(Result 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);
                     }
-                }
 
-                @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());
-                    }
+                } 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 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));
 //        for (int i = 0;i< outputStrings.size();i++) {
@@ -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);
             }
diff --git a/app/src/main/java/com/dskj/rbchat/voom/TiktoInfokActivity.java b/app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
similarity index 95%
rename from app/src/main/java/com/dskj/rbchat/voom/TiktoInfokActivity.java
rename to app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
index 616f12c..3c2de3f 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/TiktoInfokActivity.java
+++ b/app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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/"));
 //                }
diff --git a/app/src/main/java/com/dskj/rbchat/voom/TiktokActivity.java b/app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java
similarity index 97%
rename from app/src/main/java/com/dskj/rbchat/voom/TiktokActivity.java
rename to app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java
index 163d602..b4cdb18 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/TiktokActivity.java
+++ b/app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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;
diff --git a/app/src/main/java/com/dskj/rbchat/voom/TiktokActivityMe.java b/app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java
similarity index 96%
rename from app/src/main/java/com/dskj/rbchat/voom/TiktokActivityMe.java
rename to app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java
index 7786361..325277f 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/TiktokActivityMe.java
+++ b/app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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;
diff --git a/app/src/main/java/com/dskj/rbchat/voom/VoomFragment.java b/app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
similarity index 87%
rename from app/src/main/java/com/dskj/rbchat/voom/VoomFragment.java
rename to app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
index d13e92a..aca117a 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/VoomFragment.java
+++ b/app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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 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绑定在一起。特别说明一下，下面这行代码是官方给的，特别好使。
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment1.java b/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
similarity index 63%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment1.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
index 5b608dc..cca872f 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment1.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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 titles = new ArrayList<>();
     static CommonAdapter commonAdapter;
     private int categoryId;
     StaggeredGridLayoutManager linearLayoutManager;
     protected ActivityResultLauncher 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/"));
-                                } 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, s.getPicture1());
                             } else {
-//                                Glide.with(getActivity())
-//                                        .load(ApiService.URL + s.getPicture1())
-//                                        .into(pic_ic);
-                                toUrl(holder,ApiService.URL + s.getPicture1());
-
+                                toUrl(holder, ApiService.URL + s.getPicture1());
+                            }
+                        } else {
+                                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() {
-//                        @Override
-//                        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target 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() {
-//                                        public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition 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 target, DataSource dataSource, boolean isFirstResource) {
-//                            return false;
-//                        }
-//                    })
-//                    .into(new SimpleTarget() {
-//                        public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition 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() {
-//                    @Override
-//                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target 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 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);
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment2.java b/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
similarity index 78%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment2.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
index 1360cfe..ab903ab 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment2.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-package com.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 titles = new ArrayList<>();
     static CommonAdapter commonAdapter;
     private int categoryId;
     StaggeredGridLayoutManager linearLayoutManager;
     protected ActivityResultLauncher 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/"));
-                                } 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,s.getPicture1());
                             } 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);
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/CusVideoView.java b/app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java
similarity index 96%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/CusVideoView.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java
index e4afd02..a222064 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/CusVideoView.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.voom.comm;
+package com.hbl.lewan.voom.comm;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/CustomLayoutManager.java b/app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java
similarity index 97%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/CustomLayoutManager.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java
index 9d2936f..e119937 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/CustomLayoutManager.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java
@@ -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
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/OnPageSlideListener.java b/app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java
similarity index 91%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/OnPageSlideListener.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java
index 286bf75..9c4ffb9 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/OnPageSlideListener.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.voom.comm;
+package com.hbl.lewan.voom.comm;
 
 /**
  * 作者：created by Jarchie
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/OnViewPagerListener.java b/app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java
similarity index 92%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/OnViewPagerListener.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java
index b3c07df..e04deea 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/OnViewPagerListener.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.voom.comm;
+package com.hbl.lewan.voom.comm;
 
 /**
  * Created by 钉某人
diff --git a/app/src/main/java/com/dskj/rbchat/voom/comm/TiktokAdapter.java b/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
similarity index 96%
rename from app/src/main/java/com/dskj/rbchat/voom/comm/TiktokAdapter.java
rename to app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
index 8dbcf59..17465c9 100644
--- a/app/src/main/java/com/dskj/rbchat/voom/comm/TiktokAdapter.java
+++ b/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
@@ -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 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() {
                     @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();
                     }
diff --git a/app/src/main/java/com/dskj/rbchat/widget/BezierCircleHeader.java b/app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java
similarity index 99%
rename from app/src/main/java/com/dskj/rbchat/widget/BezierCircleHeader.java
rename to app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java
index afe0e19..9a99459 100644
--- a/app/src/main/java/com/dskj/rbchat/widget/BezierCircleHeader.java
+++ b/app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.widget;
+package com.hbl.lewan.widget;
 
 
 import android.animation.ValueAnimator;
diff --git a/app/src/main/java/com/dskj/rbchat/widget/CircleImageView.java b/app/src/main/java/com/hbl/lewan/widget/CircleImageView.java
similarity index 99%
rename from app/src/main/java/com/dskj/rbchat/widget/CircleImageView.java
rename to app/src/main/java/com/hbl/lewan/widget/CircleImageView.java
index 48fa105..c565cc3 100644
--- a/app/src/main/java/com/dskj/rbchat/widget/CircleImageView.java
+++ b/app/src/main/java/com/hbl/lewan/widget/CircleImageView.java
@@ -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 {
diff --git a/app/src/main/java/com/dskj/rbchat/widget/GridItemDecoration.java b/app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java
similarity index 98%
rename from app/src/main/java/com/dskj/rbchat/widget/GridItemDecoration.java
rename to app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java
index 6dab42d..b29fc9d 100644
--- a/app/src/main/java/com/dskj/rbchat/widget/GridItemDecoration.java
+++ b/app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.widget;
+package com.hbl.lewan.widget;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/dskj/rbchat/widget/StatusLayout.java b/app/src/main/java/com/hbl/lewan/widget/StatusLayout.java
similarity index 97%
rename from app/src/main/java/com/dskj/rbchat/widget/StatusLayout.java
rename to app/src/main/java/com/hbl/lewan/widget/StatusLayout.java
index 943ce48..758bce6 100644
--- a/app/src/main/java/com/dskj/rbchat/widget/StatusLayout.java
+++ b/app/src/main/java/com/hbl/lewan/widget/StatusLayout.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.widget;
+package com.hbl.lewan.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java b/app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
new file mode 100644
index 0000000..23e7437
--- /dev/null
+++ b/app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
@@ -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();
+//    }
+//
+//}
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java
new file mode 100644
index 0000000..d357cb6
--- /dev/null
+++ b/app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java
@@ -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();
+//	}
+//
+//
+//
+//
+//}
diff --git a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXin.java b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java
similarity index 95%
rename from app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXin.java
rename to app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java
index 98584e5..3302cd5 100644
--- a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXin.java
+++ b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.wxapi.bean;
+package com.hbl.lewan.wxapi.bean;
 
 /**
  * @create time 2017-09-14
diff --git a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinInfo.java b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java
similarity index 98%
rename from app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinInfo.java
rename to app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java
index 70399f8..48e8e16 100644
--- a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinInfo.java
+++ b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.wxapi.bean;
+package com.hbl.lewan.wxapi.bean;
 
 /**
  * @create time 2017-09-14
diff --git a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinToken.java b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java
similarity index 98%
rename from app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinToken.java
rename to app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java
index 0f3268d..fe741a4 100644
--- a/app/src/main/java/com/dskj/rbchat/wxapi/bean/WeiXinToken.java
+++ b/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java
@@ -1,4 +1,4 @@
-package com.dskj.rbchat.wxapi.bean;
+package com.hbl.lewan.wxapi.bean;
 
 /**
  * Created by xx on 16/6/25.
diff --git a/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java b/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
index 128083f..11e79b0 100644
--- a/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
+++ b/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
@@ -21,18 +21,18 @@ import androidx.annotation.RequiresApi;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.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;
diff --git a/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java b/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
index 722f98f..494761f 100644
--- a/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
+++ b/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
@@ -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;
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index f5e4f8f..1031b2a 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,176 +1,74 @@
 
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
diff --git a/app/src/main/res/drawable/index_user_bg1.xml b/app/src/main/res/drawable/index_user_bg1.xml
index 4f8e22b..ac87e6d 100644
--- a/app/src/main/res/drawable/index_user_bg1.xml
+++ b/app/src/main/res/drawable/index_user_bg1.xml
@@ -19,8 +19,7 @@
                 android:useLevel="true" />
             
             
+                android:radius="10dp" />
         
     
 
diff --git a/app/src/main/res/drawable/jiechujinyan_bg.xml b/app/src/main/res/drawable/jiechujinyan_bg.xml
new file mode 100644
index 0000000..3fa49a6
--- /dev/null
+++ b/app/src/main/res/drawable/jiechujinyan_bg.xml
@@ -0,0 +1,7 @@
+
+
+    
+
+    
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/kefu_loading.xml b/app/src/main/res/drawable/kefu_loading.xml
deleted file mode 100644
index e99307f..0000000
--- a/app/src/main/res/drawable/kefu_loading.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/kefu_loading1.xml b/app/src/main/res/drawable/kefu_loading1.xml
deleted file mode 100644
index 4962a22..0000000
--- a/app/src/main/res/drawable/kefu_loading1.xml
+++ /dev/null
@@ -1,723 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/kefu_loading2.xml b/app/src/main/res/drawable/kefu_loading2.xml
deleted file mode 100644
index 7467a35..0000000
--- a/app/src/main/res/drawable/kefu_loading2.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_bg.xml b/app/src/main/res/drawable/splash_bg.xml
deleted file mode 100644
index d1b1f3d..0000000
--- a/app/src/main/res/drawable/splash_bg.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-    
-        
-            
-        
-    
-
-        
-            
-        
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/splash_bg1.xml b/app/src/main/res/drawable/splash_bg1.xml
deleted file mode 100644
index a99f3f7..0000000
--- a/app/src/main/res/drawable/splash_bg1.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-    
-        
-            
-        
-    
-
-    
-            
-    
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_authorize.xml b/app/src/main/res/layout/activity_authorize.xml
index 15932a1..ab8a9bd 100644
--- a/app/src/main/res/layout/activity_authorize.xml
+++ b/app/src/main/res/layout/activity_authorize.xml
@@ -22,7 +22,7 @@
         android:layout_height="@dimen/dp_1"
         android:background="@color/color_f7f7f7" />
 
-    
     
 
+    
+
+        
+
+        
+    
+
     
+        app:layout_constraintTop_toBottomOf="@+id/fljinyan">
 
         -->
             
 
-            
 
-            
+            
 
             
 
 
-    
 
-    
+    
 
 
     
 
-            
 
-            
+            
 
-            
 
-            
+            
 
         
 
diff --git a/app/src/main/res/layout/activity_change_phone.xml b/app/src/main/res/layout/activity_change_phone.xml
index 83c0a9c..f843177 100644
--- a/app/src/main/res/layout/activity_change_phone.xml
+++ b/app/src/main/res/layout/activity_change_phone.xml
@@ -89,7 +89,7 @@
                 android:textSize="14sp" />
 
 
-            
 
-            
+            
 
             
 
 
-            
 
-            
+            
 
             
 
 
-            
 
-            
+            
 
             
 
 
-            
 
-            
+            
 
             
 
 
-            
 
-            
+            
 
             
+                    android:src="@mipmap/ic_launche" />
             
 
             
+                        android:src="@mipmap/ic_launche" />
                 
 
             
diff --git a/app/src/main/res/layout/activity_get_code_setting.xml b/app/src/main/res/layout/activity_get_code_setting.xml
index f922d00..cc05c5b 100644
--- a/app/src/main/res/layout/activity_get_code_setting.xml
+++ b/app/src/main/res/layout/activity_get_code_setting.xml
@@ -9,12 +9,12 @@
     android:orientation="vertical">
 
 
-    
 
-    
+    
 
 
     
 
-            
 
-            
+            
 
 
         
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 477ed66..745cf8f 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -49,7 +49,7 @@
 
         app:srlAccentColor="@color/color_6b3689">
 
-        
 
diff --git a/app/src/main/res/layout/activity_lipinduihuan.xml b/app/src/main/res/layout/activity_lipinduihuan.xml
index 937b433..b0dd933 100644
--- a/app/src/main/res/layout/activity_lipinduihuan.xml
+++ b/app/src/main/res/layout/activity_lipinduihuan.xml
@@ -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" />
                 
 
             
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8193597..9c0d109 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -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"
              />
     
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 79d108d..91e8b61 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -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">
 
                 
+                android:visibility="visible">
 
                 
 
-        
 
diff --git a/app/src/main/res/layout/activity_message_act.xml b/app/src/main/res/layout/activity_message_act.xml
index 1263b4b..47a1482 100644
--- a/app/src/main/res/layout/activity_message_act.xml
+++ b/app/src/main/res/layout/activity_message_act.xml
@@ -29,7 +29,7 @@
         android:visibility="visible"
         app:srlAccentColor="@color/color_fffbfb">
 
-        
 
diff --git a/app/src/main/res/layout/activity_phone_login.xml b/app/src/main/res/layout/activity_phone_login.xml
index e381958..46925e7 100644
--- a/app/src/main/res/layout/activity_phone_login.xml
+++ b/app/src/main/res/layout/activity_phone_login.xml
@@ -159,7 +159,7 @@
                 />
 
 
-            
 
-            
+            
             
         
         
 
-        
 
-        
+        
 
         
 
 
-            
 
-            
+            
 
             
-                
 
 
-            
 
-            
+            
 
             
-                
+
+
+
+    
+
+        
+
+        
+    
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_teamothersetting.xml b/app/src/main/res/layout/activity_teamothersetting.xml
index 17a295f..f91d0c3 100644
--- a/app/src/main/res/layout/activity_teamothersetting.xml
+++ b/app/src/main/res/layout/activity_teamothersetting.xml
@@ -394,7 +394,34 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_1"
                 android:background="@color/color_f4f4f4" />
+            
 
+                
+
+                
+            
+
+            
             
 
-        
diff --git a/app/src/main/res/layout/activity_userphotos.xml b/app/src/main/res/layout/activity_userphotos.xml
index 1f71796..0701390 100644
--- a/app/src/main/res/layout/activity_userphotos.xml
+++ b/app/src/main/res/layout/activity_userphotos.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
         app:srlAccentColor="@color/color_6b3689">
 
-        
 
diff --git a/app/src/main/res/layout/activity_userphotos_details.xml b/app/src/main/res/layout/activity_userphotos_details.xml
index da3a9e5..b9fe71c 100644
--- a/app/src/main/res/layout/activity_userphotos_details.xml
+++ b/app/src/main/res/layout/activity_userphotos_details.xml
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
         app:srlAccentColor="@color/color_6b3689">
 
-        
 
diff --git a/app/src/main/res/layout/activity_wangji.xml b/app/src/main/res/layout/activity_wangji.xml
index 87fca6e..dd84c60 100644
--- a/app/src/main/res/layout/activity_wangji.xml
+++ b/app/src/main/res/layout/activity_wangji.xml
@@ -181,7 +181,7 @@
                 android:textSize="14sp" />
 
 
-            
 
-            
+            
 
             
 
-        
 
-        
+
+
+
+
+
+
+
+
+
+
+        
-
+            android:src="@mipmap/ic_launche" />
 
     
 
diff --git a/app/src/main/res/layout/bottom_sheet_qrcode_layout.xml b/app/src/main/res/layout/bottom_sheet_qrcode_layout.xml
index 9b62eb0..4bb166c 100644
--- a/app/src/main/res/layout/bottom_sheet_qrcode_layout.xml
+++ b/app/src/main/res/layout/bottom_sheet_qrcode_layout.xml
@@ -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"/>
         
 
         
+                android:src="@mipmap/ic_launche" />
         
 
         
 
-    
 
-    
-            
-                
-                
-                
 
-        
 
-        
 
-        
 
diff --git a/app/src/main/res/layout/fragment_comment.xml b/app/src/main/res/layout/fragment_comment.xml
index 97ae50c..455a0c2 100644
--- a/app/src/main/res/layout/fragment_comment.xml
+++ b/app/src/main/res/layout/fragment_comment.xml
@@ -17,7 +17,7 @@
         android:layout_marginBottom="@dimen/dp_95"
         app:srlAccentColor="@color/color_6b3689">
 
-        
 
diff --git a/app/src/main/res/layout/fragment_followlist.xml b/app/src/main/res/layout/fragment_followlist.xml
index cf839c5..e4b58f1 100644
--- a/app/src/main/res/layout/fragment_followlist.xml
+++ b/app/src/main/res/layout/fragment_followlist.xml
@@ -13,7 +13,7 @@
         android:visibility="visible"
         app:srlAccentColor="@color/color_6b3689">
 
-        
 
diff --git a/app/src/main/res/layout/fragment_home_new.xml b/app/src/main/res/layout/fragment_home_new.xml
index 2bf8e55..7bb5c0c 100644
--- a/app/src/main/res/layout/fragment_home_new.xml
+++ b/app/src/main/res/layout/fragment_home_new.xml
@@ -15,7 +15,7 @@
         android:visibility="visible"
         app:srlAccentColor="@color/white">
 
-        
 
@@ -548,15 +548,15 @@
                                 app:layout_constraintRight_toRightOf="parent"
                                 app:layout_constraintTop_toTopOf="parent">
 
-                                
+
+
+
+
+
+
+
+
+
                             
                         
                     
@@ -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 @@
     
@@ -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"
diff --git a/app/src/main/res/layout/fragment_index.xml b/app/src/main/res/layout/fragment_index.xml
index ffff8a5..b9318a9 100644
--- a/app/src/main/res/layout/fragment_index.xml
+++ b/app/src/main/res/layout/fragment_index.xml
@@ -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">
diff --git a/app/src/main/res/layout/fragment_index2.xml b/app/src/main/res/layout/fragment_index2.xml
index d42ae51..57b0c8a 100644
--- a/app/src/main/res/layout/fragment_index2.xml
+++ b/app/src/main/res/layout/fragment_index2.xml
@@ -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 @@
                 
 
                     
-
+                
             
 
             
 
-        
 
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 544eb96..7ce5acd 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    
diff --git a/app/src/main/res/layout/fragment_mine_new.xml b/app/src/main/res/layout/fragment_mine_new.xml
index 92ddb79..4dbc28a 100644
--- a/app/src/main/res/layout/fragment_mine_new.xml
+++ b/app/src/main/res/layout/fragment_mine_new.xml
@@ -176,7 +176,7 @@
                 
 
@@ -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">
 
                             
                             
 
-                            
-
                             
 
                                 
                             
 
-                            
-
                             
 
                             
-    
diff --git a/app/src/main/res/layout/fragment_wallet_info.xml b/app/src/main/res/layout/fragment_wallet_info.xml
index 9925d7e..020dd29 100644
--- a/app/src/main/res/layout/fragment_wallet_info.xml
+++ b/app/src/main/res/layout/fragment_wallet_info.xml
@@ -57,7 +57,7 @@
 
             app:srlAccentColor="@color/color_6b3689">
 
-            
 
diff --git a/app/src/main/res/layout/fragment_wallet_info1.xml b/app/src/main/res/layout/fragment_wallet_info1.xml
index 4754cb9..9b44f59 100644
--- a/app/src/main/res/layout/fragment_wallet_info1.xml
+++ b/app/src/main/res/layout/fragment_wallet_info1.xml
@@ -57,7 +57,7 @@
             android:visibility="visible"
             app:srlAccentColor="@color/color_6b3689">
 
-            
 
diff --git a/app/src/main/res/layout/item_comment_list.xml b/app/src/main/res/layout/item_comment_list.xml
index 56a6b02..c4f6c10 100644
--- a/app/src/main/res/layout/item_comment_list.xml
+++ b/app/src/main/res/layout/item_comment_list.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="@dimen/dp_5"
     tools:ignore="MissingDefaultResource">
 
-    
 
-    
 
-    
-        
-        
+            android:src="@mipmap/ic_launche"/>
         
 
-        
 
-    
 
-            
+                android:src="@mipmap/ic_launche"/>
             
-            
 
-                    
+                        android:src="@mipmap/ic_launche"/>
                     
 
+    
+
 
\ No newline at end of file
diff --git a/app/src/main/res/layout/team_members_view_holder1.xml b/app/src/main/res/layout/team_members_view_holder1.xml
new file mode 100644
index 0000000..6fe0fb8
--- /dev/null
+++ b/app/src/main/res/layout/team_members_view_holder1.xml
@@ -0,0 +1,66 @@
+
+
+
+
+    
+
+    
+
+
+    
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launche.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launche.xml
new file mode 100644
index 0000000..7b9e324
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launche.xml
@@ -0,0 +1,5 @@
+
+
+    
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launche_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launche_round.xml
new file mode 100644
index 0000000..7b9e324
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launche_round.xml
@@ -0,0 +1,5 @@
+
+
+    
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 7dc5bde..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 9a2abdd..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 6774508..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 61179f4..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1df9596..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 4686b5d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launche.webp b/app/src/main/res/mipmap-xhdpi/ic_launche.webp
new file mode 100644
index 0000000..4485816
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launche.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launche_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launche_foreground.webp
new file mode 100644
index 0000000..0cceb76
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launche_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launche_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launche_round.webp
new file mode 100644
index 0000000..4b46cff
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launche_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index e8a2c99..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index b1b3cbc..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index e1ed562..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_000.png b/app/src/main/res/mipmap-xxhdpi/gou01_000.png
deleted file mode 100644
index 612c4bd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_000.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_001.png b/app/src/main/res/mipmap-xxhdpi/gou01_001.png
deleted file mode 100644
index 62018e8..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_001.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_002.png b/app/src/main/res/mipmap-xxhdpi/gou01_002.png
deleted file mode 100644
index 6a3a1d4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_002.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_003.png b/app/src/main/res/mipmap-xxhdpi/gou01_003.png
deleted file mode 100644
index bc6aed6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_003.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_004.png b/app/src/main/res/mipmap-xxhdpi/gou01_004.png
deleted file mode 100644
index f95baf6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_004.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_005.png b/app/src/main/res/mipmap-xxhdpi/gou01_005.png
deleted file mode 100644
index 36ad8c9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_005.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_006.png b/app/src/main/res/mipmap-xxhdpi/gou01_006.png
deleted file mode 100644
index 4c96098..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_006.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_007.png b/app/src/main/res/mipmap-xxhdpi/gou01_007.png
deleted file mode 100644
index 03d4f5a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_007.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_008.png b/app/src/main/res/mipmap-xxhdpi/gou01_008.png
deleted file mode 100644
index c684a43..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_008.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_009.png b/app/src/main/res/mipmap-xxhdpi/gou01_009.png
deleted file mode 100644
index 5285cea..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_009.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_010.png b/app/src/main/res/mipmap-xxhdpi/gou01_010.png
deleted file mode 100644
index 7b53ab9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_010.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_011.png b/app/src/main/res/mipmap-xxhdpi/gou01_011.png
deleted file mode 100644
index 31579cc..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_011.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_012.png b/app/src/main/res/mipmap-xxhdpi/gou01_012.png
deleted file mode 100644
index db7ca9a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_012.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_013.png b/app/src/main/res/mipmap-xxhdpi/gou01_013.png
deleted file mode 100644
index a64b2b6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_013.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_014.png b/app/src/main/res/mipmap-xxhdpi/gou01_014.png
deleted file mode 100644
index 60c0e48..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_014.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_015.png b/app/src/main/res/mipmap-xxhdpi/gou01_015.png
deleted file mode 100644
index b655f1c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_015.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_016.png b/app/src/main/res/mipmap-xxhdpi/gou01_016.png
deleted file mode 100644
index aa1fa60..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_016.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_017.png b/app/src/main/res/mipmap-xxhdpi/gou01_017.png
deleted file mode 100644
index 03ad1de..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_017.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_018.png b/app/src/main/res/mipmap-xxhdpi/gou01_018.png
deleted file mode 100644
index 7631f35..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_018.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_019.png b/app/src/main/res/mipmap-xxhdpi/gou01_019.png
deleted file mode 100644
index e5cf670..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_019.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_020.png b/app/src/main/res/mipmap-xxhdpi/gou01_020.png
deleted file mode 100644
index 107ba61..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_020.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_021.png b/app/src/main/res/mipmap-xxhdpi/gou01_021.png
deleted file mode 100644
index dae715c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_021.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_022.png b/app/src/main/res/mipmap-xxhdpi/gou01_022.png
deleted file mode 100644
index 7fd6c45..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_022.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_023.png b/app/src/main/res/mipmap-xxhdpi/gou01_023.png
deleted file mode 100644
index 8675a07..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_023.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_024.png b/app/src/main/res/mipmap-xxhdpi/gou01_024.png
deleted file mode 100644
index fc74d93..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_024.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_025.png b/app/src/main/res/mipmap-xxhdpi/gou01_025.png
deleted file mode 100644
index b9cd281..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_025.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_026.png b/app/src/main/res/mipmap-xxhdpi/gou01_026.png
deleted file mode 100644
index f934be4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_026.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_027.png b/app/src/main/res/mipmap-xxhdpi/gou01_027.png
deleted file mode 100644
index 7af9f93..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_027.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_028.png b/app/src/main/res/mipmap-xxhdpi/gou01_028.png
deleted file mode 100644
index 82c5583..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_028.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_029.png b/app/src/main/res/mipmap-xxhdpi/gou01_029.png
deleted file mode 100644
index cf073b6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_029.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_030.png b/app/src/main/res/mipmap-xxhdpi/gou01_030.png
deleted file mode 100644
index 5e0c72e..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_030.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_031.png b/app/src/main/res/mipmap-xxhdpi/gou01_031.png
deleted file mode 100644
index c6076cf..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_031.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_032.png b/app/src/main/res/mipmap-xxhdpi/gou01_032.png
deleted file mode 100644
index 7ba822b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_032.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_033.png b/app/src/main/res/mipmap-xxhdpi/gou01_033.png
deleted file mode 100644
index b6a7877..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_033.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_034.png b/app/src/main/res/mipmap-xxhdpi/gou01_034.png
deleted file mode 100644
index 191270f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_034.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_035.png b/app/src/main/res/mipmap-xxhdpi/gou01_035.png
deleted file mode 100644
index 94a6bbd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_035.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_036.png b/app/src/main/res/mipmap-xxhdpi/gou01_036.png
deleted file mode 100644
index 3279a28..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_036.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_037.png b/app/src/main/res/mipmap-xxhdpi/gou01_037.png
deleted file mode 100644
index 3d1b7a2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_037.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_038.png b/app/src/main/res/mipmap-xxhdpi/gou01_038.png
deleted file mode 100644
index 1c5078a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_038.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_039.png b/app/src/main/res/mipmap-xxhdpi/gou01_039.png
deleted file mode 100644
index 575474f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_039.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_040.png b/app/src/main/res/mipmap-xxhdpi/gou01_040.png
deleted file mode 100644
index ccd47c2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_040.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_041.png b/app/src/main/res/mipmap-xxhdpi/gou01_041.png
deleted file mode 100644
index 2aa3adc..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_041.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_042.png b/app/src/main/res/mipmap-xxhdpi/gou01_042.png
deleted file mode 100644
index 1401cbf..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_042.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_043.png b/app/src/main/res/mipmap-xxhdpi/gou01_043.png
deleted file mode 100644
index d5c1cda..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_043.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_044.png b/app/src/main/res/mipmap-xxhdpi/gou01_044.png
deleted file mode 100644
index ef5816c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_044.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_045.png b/app/src/main/res/mipmap-xxhdpi/gou01_045.png
deleted file mode 100644
index b1dda35..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_045.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_046.png b/app/src/main/res/mipmap-xxhdpi/gou01_046.png
deleted file mode 100644
index 80a008c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_046.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_047.png b/app/src/main/res/mipmap-xxhdpi/gou01_047.png
deleted file mode 100644
index e19c027..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_047.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_048.png b/app/src/main/res/mipmap-xxhdpi/gou01_048.png
deleted file mode 100644
index 1b1626a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_048.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_049.png b/app/src/main/res/mipmap-xxhdpi/gou01_049.png
deleted file mode 100644
index 3139c65..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_049.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_050.png b/app/src/main/res/mipmap-xxhdpi/gou01_050.png
deleted file mode 100644
index ad9c730..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_050.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_051.png b/app/src/main/res/mipmap-xxhdpi/gou01_051.png
deleted file mode 100644
index 89f582f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_051.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_052.png b/app/src/main/res/mipmap-xxhdpi/gou01_052.png
deleted file mode 100644
index 4714be7..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_052.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_053.png b/app/src/main/res/mipmap-xxhdpi/gou01_053.png
deleted file mode 100644
index 58bad9b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_053.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_054.png b/app/src/main/res/mipmap-xxhdpi/gou01_054.png
deleted file mode 100644
index c5c4395..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_054.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_055.png b/app/src/main/res/mipmap-xxhdpi/gou01_055.png
deleted file mode 100644
index 43b741b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_055.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_056.png b/app/src/main/res/mipmap-xxhdpi/gou01_056.png
deleted file mode 100644
index 747772a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_056.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_057.png b/app/src/main/res/mipmap-xxhdpi/gou01_057.png
deleted file mode 100644
index 2933d72..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_057.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_058.png b/app/src/main/res/mipmap-xxhdpi/gou01_058.png
deleted file mode 100644
index f8ece05..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_058.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_059.png b/app/src/main/res/mipmap-xxhdpi/gou01_059.png
deleted file mode 100644
index 1e69796..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_059.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_060.png b/app/src/main/res/mipmap-xxhdpi/gou01_060.png
deleted file mode 100644
index 61ece2e..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_060.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_061.png b/app/src/main/res/mipmap-xxhdpi/gou01_061.png
deleted file mode 100644
index 087550b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_061.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_062.png b/app/src/main/res/mipmap-xxhdpi/gou01_062.png
deleted file mode 100644
index 2f6d0ac..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_062.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_063.png b/app/src/main/res/mipmap-xxhdpi/gou01_063.png
deleted file mode 100644
index 68d9436..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_063.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_064.png b/app/src/main/res/mipmap-xxhdpi/gou01_064.png
deleted file mode 100644
index cf61bfa..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_064.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_065.png b/app/src/main/res/mipmap-xxhdpi/gou01_065.png
deleted file mode 100644
index 1c5a7b2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_065.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_066.png b/app/src/main/res/mipmap-xxhdpi/gou01_066.png
deleted file mode 100644
index 40c0594..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_066.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_067.png b/app/src/main/res/mipmap-xxhdpi/gou01_067.png
deleted file mode 100644
index 1edfef1..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_067.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_068.png b/app/src/main/res/mipmap-xxhdpi/gou01_068.png
deleted file mode 100644
index 1dcb581..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_068.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_069.png b/app/src/main/res/mipmap-xxhdpi/gou01_069.png
deleted file mode 100644
index 8672a0c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_069.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_070.png b/app/src/main/res/mipmap-xxhdpi/gou01_070.png
deleted file mode 100644
index a70616a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_070.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_071.png b/app/src/main/res/mipmap-xxhdpi/gou01_071.png
deleted file mode 100644
index da4cd82..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_071.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_072.png b/app/src/main/res/mipmap-xxhdpi/gou01_072.png
deleted file mode 100644
index fc05bee..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_072.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_073.png b/app/src/main/res/mipmap-xxhdpi/gou01_073.png
deleted file mode 100644
index 04dc246..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_073.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_074.png b/app/src/main/res/mipmap-xxhdpi/gou01_074.png
deleted file mode 100644
index 119f794..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_074.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_075.png b/app/src/main/res/mipmap-xxhdpi/gou01_075.png
deleted file mode 100644
index 8bbe6af..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_075.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_076.png b/app/src/main/res/mipmap-xxhdpi/gou01_076.png
deleted file mode 100644
index 58606a4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_076.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_077.png b/app/src/main/res/mipmap-xxhdpi/gou01_077.png
deleted file mode 100644
index 45c4f61..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_077.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_078.png b/app/src/main/res/mipmap-xxhdpi/gou01_078.png
deleted file mode 100644
index f148ed3..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_078.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_079.png b/app/src/main/res/mipmap-xxhdpi/gou01_079.png
deleted file mode 100644
index 9056260..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_079.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_080.png b/app/src/main/res/mipmap-xxhdpi/gou01_080.png
deleted file mode 100644
index edfd6dc..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_080.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_081.png b/app/src/main/res/mipmap-xxhdpi/gou01_081.png
deleted file mode 100644
index e71afc3..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_081.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_082.png b/app/src/main/res/mipmap-xxhdpi/gou01_082.png
deleted file mode 100644
index 8fcaedd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_082.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_083.png b/app/src/main/res/mipmap-xxhdpi/gou01_083.png
deleted file mode 100644
index 9e10d75..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_083.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_084.png b/app/src/main/res/mipmap-xxhdpi/gou01_084.png
deleted file mode 100644
index 5c3286d..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_084.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_085.png b/app/src/main/res/mipmap-xxhdpi/gou01_085.png
deleted file mode 100644
index e45ff92..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_085.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_086.png b/app/src/main/res/mipmap-xxhdpi/gou01_086.png
deleted file mode 100644
index c2e7e9d..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_086.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_087.png b/app/src/main/res/mipmap-xxhdpi/gou01_087.png
deleted file mode 100644
index bec1ba6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_087.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_088.png b/app/src/main/res/mipmap-xxhdpi/gou01_088.png
deleted file mode 100644
index 7757eca..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_088.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_089.png b/app/src/main/res/mipmap-xxhdpi/gou01_089.png
deleted file mode 100644
index 18c7de4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_089.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_090.png b/app/src/main/res/mipmap-xxhdpi/gou01_090.png
deleted file mode 100644
index ffb58bb..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_090.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_091.png b/app/src/main/res/mipmap-xxhdpi/gou01_091.png
deleted file mode 100644
index 2b02050..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_091.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_092.png b/app/src/main/res/mipmap-xxhdpi/gou01_092.png
deleted file mode 100644
index a8fcd49..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_092.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_093.png b/app/src/main/res/mipmap-xxhdpi/gou01_093.png
deleted file mode 100644
index dea3eb9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_093.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_094.png b/app/src/main/res/mipmap-xxhdpi/gou01_094.png
deleted file mode 100644
index e87c66f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_094.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_095.png b/app/src/main/res/mipmap-xxhdpi/gou01_095.png
deleted file mode 100644
index 6f5798c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_095.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_096.png b/app/src/main/res/mipmap-xxhdpi/gou01_096.png
deleted file mode 100644
index a860734..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_096.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_097.png b/app/src/main/res/mipmap-xxhdpi/gou01_097.png
deleted file mode 100644
index c4bcd06..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_097.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_098.png b/app/src/main/res/mipmap-xxhdpi/gou01_098.png
deleted file mode 100644
index 566cc57..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_098.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_099.png b/app/src/main/res/mipmap-xxhdpi/gou01_099.png
deleted file mode 100644
index 8c605b8..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_099.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_100.png b/app/src/main/res/mipmap-xxhdpi/gou01_100.png
deleted file mode 100644
index 398639a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_100.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_101.png b/app/src/main/res/mipmap-xxhdpi/gou01_101.png
deleted file mode 100644
index a4284c4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_101.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_102.png b/app/src/main/res/mipmap-xxhdpi/gou01_102.png
deleted file mode 100644
index 062d1b9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_102.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_103.png b/app/src/main/res/mipmap-xxhdpi/gou01_103.png
deleted file mode 100644
index b39e763..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_103.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_104.png b/app/src/main/res/mipmap-xxhdpi/gou01_104.png
deleted file mode 100644
index ed06f37..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_104.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_105.png b/app/src/main/res/mipmap-xxhdpi/gou01_105.png
deleted file mode 100644
index 3c7cfe0..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_105.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_106.png b/app/src/main/res/mipmap-xxhdpi/gou01_106.png
deleted file mode 100644
index 363cfb7..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_106.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_107.png b/app/src/main/res/mipmap-xxhdpi/gou01_107.png
deleted file mode 100644
index f513d56..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_107.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_108.png b/app/src/main/res/mipmap-xxhdpi/gou01_108.png
deleted file mode 100644
index 0851096..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_108.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gou01_109.png b/app/src/main/res/mipmap-xxhdpi/gou01_109.png
deleted file mode 100644
index 873b715..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gou01_109.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launche.webp b/app/src/main/res/mipmap-xxhdpi/ic_launche.webp
new file mode 100644
index 0000000..4485816
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launche.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launche_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launche_foreground.webp
new file mode 100644
index 0000000..0cceb76
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launche_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launche_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launche_round.webp
new file mode 100644
index 0000000..4b46cff
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launche_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 503515c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 7b13fb9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index f0a99f4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/index_xiaomeng_img.png b/app/src/main/res/mipmap-xxhdpi/index_xiaomeng_img.png
deleted file mode 100644
index 21159d5..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/index_xiaomeng_img.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/jinyan_red_img.png b/app/src/main/res/mipmap-xxhdpi/jinyan_red_img.png
new file mode 100644
index 0000000..c2277d1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/jinyan_red_img.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/jinyan_red_img1.png b/app/src/main/res/mipmap-xxhdpi/jinyan_red_img1.png
new file mode 100644
index 0000000..9cc25ce
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/jinyan_red_img1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/me_qianbao_img.png b/app/src/main/res/mipmap-xxhdpi/me_qianbao_img.png
new file mode 100644
index 0000000..003902c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/me_qianbao_img.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/mm_tw_logo.png b/app/src/main/res/mipmap-xxhdpi/mm_tw_logo.png
new file mode 100644
index 0000000..797ec94
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mm_tw_logo.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/mm_tw_logo1.jpg b/app/src/main/res/mipmap-xxhdpi/mm_tw_logo1.jpg
new file mode 100644
index 0000000..9bdaba4
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mm_tw_logo1.jpg differ
diff --git a/app/src/main/res/mipmap-xxhdpi/start_bitmap.png b/app/src/main/res/mipmap-xxhdpi/start_bitmap.png
deleted file mode 100644
index 7ac71e9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/start_bitmap.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/start_game.gif b/app/src/main/res/mipmap-xxhdpi/start_game.gif
deleted file mode 100644
index 6c14a79..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/start_game.gif and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/start_gif1.gif b/app/src/main/res/mipmap-xxhdpi/start_gif1.gif
deleted file mode 100644
index 4b281f3..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/start_gif1.gif and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/start_gif2.gif b/app/src/main/res/mipmap-xxhdpi/start_gif2.gif
deleted file mode 100644
index f7b44af..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/start_gif2.gif and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/start_logo.png b/app/src/main/res/mipmap-xxhdpi/start_logo.png
deleted file mode 100644
index 0553602..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/start_logo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_00.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_00.png
deleted file mode 100644
index ae839cb..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_00.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_01.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_01.png
deleted file mode 100644
index 6c9fc1f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_01.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_02.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_02.png
deleted file mode 100644
index 6a74e01..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_02.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_03.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_03.png
deleted file mode 100644
index ad336cd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_03.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_04.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_04.png
deleted file mode 100644
index 4657e71..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_04.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_05.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_05.png
deleted file mode 100644
index d3cd88e..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_05.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_06.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_06.png
deleted file mode 100644
index ca17669..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_06.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_07.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_07.png
deleted file mode 100644
index ceda353..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_07.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_08.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_08.png
deleted file mode 100644
index 12b0f85..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_08.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_09.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_09.png
deleted file mode 100644
index e48026c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_09.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_10.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_10.png
deleted file mode 100644
index 5cd98c6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_10.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_11.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_11.png
deleted file mode 100644
index c396d63..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_11.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_12.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_12.png
deleted file mode 100644
index b8c6da1..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_12.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_13.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_13.png
deleted file mode 100644
index 9299275..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_13.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_14.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_14.png
deleted file mode 100644
index 4891876..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_14.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_15.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_15.png
deleted file mode 100644
index 50de5a2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_15.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_16.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_16.png
deleted file mode 100644
index 602c757..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_16.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_17.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_17.png
deleted file mode 100644
index 0358a3f..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_17.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_18.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_18.png
deleted file mode 100644
index c00fcfd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_18.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_19.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_19.png
deleted file mode 100644
index f4e4635..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_19.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_20.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_20.png
deleted file mode 100644
index e92ea5a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_20.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_21.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_21.png
deleted file mode 100644
index 31b2bd3..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_21.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_22.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_22.png
deleted file mode 100644
index a4549e0..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_22.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_23.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_23.png
deleted file mode 100644
index 2621acb..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_23.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_24.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_24.png
deleted file mode 100644
index 010cad6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_24.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_25.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_25.png
deleted file mode 100644
index 8e8ce15..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_25.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_26.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_26.png
deleted file mode 100644
index 7ea9936..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_26.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_27.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_27.png
deleted file mode 100644
index b7b747b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_27.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_28.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_28.png
deleted file mode 100644
index f114798..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_28.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_29.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_29.png
deleted file mode 100644
index a76a9e2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_29.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_30.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_30.png
deleted file mode 100644
index 0b43154..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_30.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_31.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_31.png
deleted file mode 100644
index 3a7b19b..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_31.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_32.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_32.png
deleted file mode 100644
index ed9412a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_32.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_33.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_33.png
deleted file mode 100644
index f2de681..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_33.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_34.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_34.png
deleted file mode 100644
index ce3799c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_34.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_35.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_35.png
deleted file mode 100644
index a50cdbd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_35.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_36.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_36.png
deleted file mode 100644
index b3fb63c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_36.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_37.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_37.png
deleted file mode 100644
index 35e70e1..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_37.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_38.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_38.png
deleted file mode 100644
index 4d1bbe4..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_38.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/xuanfu_39.png b/app/src/main/res/mipmap-xxhdpi/xuanfu_39.png
deleted file mode 100644
index 48966e6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/xuanfu_39.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launche.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launche.webp
new file mode 100644
index 0000000..4485816
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launche.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launche_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launche_foreground.webp
new file mode 100644
index 0000000..0cceb76
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launche_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launche_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launche_round.webp
new file mode 100644
index 0000000..4b46cff
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launche_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 7c4bb82..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 767a075..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index b5b450a..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index 7477b22..346317b 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -3,4 +3,6 @@
 
 
     You can only select at most %1$s photos or videos
+    Banned members
+    Lift the ban on speech
 
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index eba2060..4fb5dbf 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -7,7 +7,7 @@
 
     AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8
 
-    淘夢購
+    乐玩
     Netease CommsEase
     Stable instant messaging service
 
@@ -44,7 +44,7 @@
     [Video Call]
 
     Favorites
-    About 淘夢購
+    About MM
     Settings
     Version
     introduce
@@ -324,7 +324,7 @@
     Unsupported 2D code content! 
     Authorized login
     淘樂町 store device login
-    Apply to log in with your 淘夢購 account
+    Apply to log in with your MM account
     Your avatar and nickname will be authorized for use
     Allow
     Reject
@@ -334,7 +334,7 @@
     Clear
     Are you sure you want to clear the Q&A history?
     Smart Dream answer is being generated, please wait...
-    您好，我是淘夢購團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求
+    您好，我是MM團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求
     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
     Hey there! I am your new friend Xiao Meng
@@ -349,6 +349,7 @@
     You guys haven’t talked yet~
     There is no chat record yet~
     Gold coin balance has been deposited, click to view>
+    Gift points balance has been credited, click to view>
     Gold coins
     Points
     Silver coins
@@ -363,6 +364,7 @@
     pc
     Congratulations on getting rich and good luck
     Put Cash into the red envelope
+    Stuff gift points into the red envelope
     Put gold coins into the red envelope
     If not collected within 24 hours, the red envelope quantity will be returned
     Click to select give away object
@@ -832,7 +834,7 @@
     Overtime unpaid
     Payment timeout
     residue %s
-    Web淘梦购
+    WebMM
     Gift cabinet redemption
     Gift cabinet redemption-
     Today Active
@@ -889,7 +891,7 @@
     Move to Another Album
     This album is set to only be viewable by friends. Please send a friend request to view.
     Please select the question you want to inquire about:
-    Questions about Taomenggou
+    Questions about MM
     Questions about Taoleting
     Questions about the Points Mall
     Questions about Cooperative Merchants
@@ -909,6 +911,7 @@
     %d Issue
     Including service fee NT$ %d
     Please select the number of installments
+    Global Chat
 
     Not set yet, go add it~
     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.
@@ -922,5 +925,7 @@
     Added successfully
     Please select an administrator
     Multi-select
+    Banned members
+    Lift the ban on speech
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 212cc13..c8c01b3 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -2,4 +2,6 @@
 
 
     最大 %1$s 個の写真またはビデオのみ選択できます
+    已禁言成员
+    解除禁言
 
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index cdb20a9..a681233 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -7,7 +7,7 @@
 
     AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8
 
-    MM
+    乐玩
     網易雲信
     真正穩定的IM 雲端服務
 
@@ -832,7 +832,7 @@
     タイムアウト未払い
     支払タイムアウト
     余剰 %s
-    ホームページ版淘夢購
+    ホームページ版MM
     ギフトボックスの交換
     ギフトボックスの交換-
     今日アクティブ
@@ -925,5 +925,7 @@
     世界チャット
 
     多选
+    已禁言成员
+    解除禁言
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 49aa82a..8f7a72c 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -23,30 +23,30 @@
         true
 
     
-    
+
 
 
     
     #DDDDDD
-
-
+    #FFFFFF
+    #FFFFFF
     #FFFFFFFF
     #ff333333
     #80333333
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 7685673..0000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-    #6B3689
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc77c66..e5e876b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
 
     AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8
 
-    MM
+    乐玩
     网易云信
     真正稳定的IM 云服务
 
@@ -916,6 +916,8 @@
     添加成功
     请选择管理员
     多选
+    已禁言成员
+    解除禁言
 
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6905f52..620564d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,24 +23,24 @@
 
     
 
-    
+
+