第一次提交
This commit is contained in:
xuhuixiang
@@ -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() {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,339 +0,0 @@
|
||||
package com.dskj.rbchat.jpush;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.util.SparseArray;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
import cn.jpush.android.api.JPushInterface;
|
||||
import cn.jpush.android.api.JPushMessage;
|
||||
import cn.jpush.android.helper.Logger;
|
||||
|
||||
/**
|
||||
* 处理tagalias相关的逻辑
|
||||
* */
|
||||
public class TagAliasOperatorHelper {
|
||||
private static final String TAG = "JIGUANG-TagAliasHelper";
|
||||
public static int sequence = 1;
|
||||
/**增加*/
|
||||
public static final int ACTION_ADD = 1;
|
||||
/**覆盖*/
|
||||
public static final int ACTION_SET = 2;
|
||||
/**删除部分*/
|
||||
public static final int ACTION_DELETE = 3;
|
||||
/**删除所有*/
|
||||
public static final int ACTION_CLEAN = 4;
|
||||
/**查询*/
|
||||
public static final int ACTION_GET = 5;
|
||||
|
||||
public static final int ACTION_CHECK = 6;
|
||||
|
||||
public static final int DELAY_SEND_ACTION = 1;
|
||||
|
||||
public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
|
||||
|
||||
private Context context;
|
||||
|
||||
private static TagAliasOperatorHelper mInstance;
|
||||
private TagAliasOperatorHelper(){
|
||||
}
|
||||
public static TagAliasOperatorHelper getInstance(){
|
||||
if(mInstance == null){
|
||||
synchronized (TagAliasOperatorHelper.class){
|
||||
if(mInstance == null){
|
||||
mInstance = new TagAliasOperatorHelper();
|
||||
}
|
||||
}
|
||||
}
|
||||
return mInstance;
|
||||
}
|
||||
public void init(Context context){
|
||||
if(context != null) {
|
||||
this.context = context.getApplicationContext();
|
||||
}
|
||||
}
|
||||
private SparseArray<Object> setActionCache = new SparseArray<Object>();
|
||||
|
||||
public Object get(int sequence){
|
||||
return setActionCache.get(sequence);
|
||||
}
|
||||
public Object remove(int sequence){
|
||||
return setActionCache.get(sequence);
|
||||
}
|
||||
public void put(int sequence,Object tagAliasBean){
|
||||
setActionCache.put(sequence,tagAliasBean);
|
||||
}
|
||||
private Handler delaySendHandler = new Handler(){
|
||||
@Override
|
||||
public void handleMessage(Message msg) {
|
||||
switch (msg.what){
|
||||
case DELAY_SEND_ACTION:
|
||||
if(msg.obj !=null && msg.obj instanceof TagAliasBean){
|
||||
Logger.i(TAG,"on delay time");
|
||||
sequence++;
|
||||
TagAliasBean tagAliasBean = (TagAliasBean) msg.obj;
|
||||
setActionCache.put(sequence, tagAliasBean);
|
||||
if(context!=null) {
|
||||
handleAction(context, sequence, tagAliasBean);
|
||||
}else{
|
||||
Logger.e(TAG,"#unexcepted - context was null");
|
||||
}
|
||||
}else{
|
||||
Logger.w(TAG,"#unexcepted - msg obj was incorrect");
|
||||
}
|
||||
break;
|
||||
case DELAY_SET_MOBILE_NUMBER_ACTION:
|
||||
if(msg.obj !=null && msg.obj instanceof String) {
|
||||
Logger.i(TAG, "retry set mobile number");
|
||||
sequence++;
|
||||
String mobileNumber = (String) msg.obj;
|
||||
setActionCache.put(sequence, mobileNumber);
|
||||
if(context !=null) {
|
||||
handleAction(context, sequence, mobileNumber);
|
||||
}else {
|
||||
Logger.e(TAG, "#unexcepted - context was null");
|
||||
}
|
||||
}else{
|
||||
Logger.w(TAG,"#unexcepted - msg obj was incorrect");
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
public void handleAction(Context context,int sequence,String mobileNumber){
|
||||
put(sequence,mobileNumber);
|
||||
Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
|
||||
JPushInterface.setMobileNumber(context,sequence,mobileNumber);
|
||||
}
|
||||
/**
|
||||
* 处理设置tag
|
||||
* */
|
||||
public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
|
||||
init(context);
|
||||
if(tagAliasBean == null){
|
||||
Logger.w(TAG,"tagAliasBean was null");
|
||||
return;
|
||||
}
|
||||
put(sequence,tagAliasBean);
|
||||
if(tagAliasBean.isAliasAction){
|
||||
switch (tagAliasBean.action){
|
||||
case ACTION_GET:
|
||||
JPushInterface.getAlias(context,sequence);
|
||||
break;
|
||||
case ACTION_DELETE:
|
||||
JPushInterface.deleteAlias(context,sequence);
|
||||
break;
|
||||
case ACTION_SET:
|
||||
JPushInterface.setAlias(context,sequence,tagAliasBean.alias);
|
||||
break;
|
||||
default:
|
||||
Logger.w(TAG,"unsupport alias action type");
|
||||
return;
|
||||
}
|
||||
}else {
|
||||
switch (tagAliasBean.action) {
|
||||
case ACTION_ADD:
|
||||
JPushInterface.addTags(context, sequence, tagAliasBean.tags);
|
||||
break;
|
||||
case ACTION_SET:
|
||||
JPushInterface.setTags(context, sequence, tagAliasBean.tags);
|
||||
break;
|
||||
case ACTION_DELETE:
|
||||
JPushInterface.deleteTags(context, sequence, tagAliasBean.tags);
|
||||
break;
|
||||
case ACTION_CHECK:
|
||||
//一次只能check一个tag
|
||||
String tag = (String)tagAliasBean.tags.toArray()[0];
|
||||
JPushInterface.checkTagBindState(context,sequence,tag);
|
||||
break;
|
||||
case ACTION_GET:
|
||||
JPushInterface.getAllTags(context, sequence);
|
||||
break;
|
||||
case ACTION_CLEAN:
|
||||
JPushInterface.cleanTags(context, sequence);
|
||||
break;
|
||||
default:
|
||||
Logger.w(TAG,"unsupport tag action type");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
private boolean RetryActionIfNeeded(int errorCode,TagAliasBean tagAliasBean){
|
||||
if(!Utils.isConnected(context)){
|
||||
Logger.w(TAG,"no network");
|
||||
return false;
|
||||
}
|
||||
//返回的错误码为6002 超时,6014 服务器繁忙,都建议延迟重试
|
||||
if(errorCode == 6002 || errorCode == 6014){
|
||||
Logger.d(TAG,"need retry");
|
||||
if(tagAliasBean!=null){
|
||||
Message message = new Message();
|
||||
message.what = DELAY_SEND_ACTION;
|
||||
message.obj = tagAliasBean;
|
||||
delaySendHandler.sendMessageDelayed(message,1000*60);
|
||||
String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
|
||||
Utils.showToast(logs, context);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
|
||||
if(!Utils.isConnected(context)){
|
||||
Logger.w(TAG,"no network");
|
||||
return false;
|
||||
}
|
||||
//返回的错误码为6002 超时,6024 服务器内部错误,建议稍后重试
|
||||
if(errorCode == 6002 || errorCode == 6024){
|
||||
Logger.d(TAG,"need retry");
|
||||
Message message = new Message();
|
||||
message.what = DELAY_SET_MOBILE_NUMBER_ACTION;
|
||||
message.obj = mobileNumber;
|
||||
delaySendHandler.sendMessageDelayed(message,1000*60);
|
||||
String str = "Failed to set mobile number due to %s. Try again after 60s.";
|
||||
str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
|
||||
Utils.showToast(str, context);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
}
|
||||
private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
|
||||
String str = "Failed to %s %s due to %s. Try again after 60s.";
|
||||
str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
|
||||
return str;
|
||||
}
|
||||
|
||||
private String getActionStr(int actionType){
|
||||
switch (actionType){
|
||||
case ACTION_ADD:
|
||||
return "add";
|
||||
case ACTION_SET:
|
||||
return "set";
|
||||
case ACTION_DELETE:
|
||||
return "delete";
|
||||
case ACTION_GET:
|
||||
return "get";
|
||||
case ACTION_CLEAN:
|
||||
return "clean";
|
||||
case ACTION_CHECK:
|
||||
return "check";
|
||||
}
|
||||
return "unkonw operation";
|
||||
}
|
||||
public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
int sequence = jPushMessage.getSequence();
|
||||
Logger.i(TAG,"action - onTagOperatorResult, sequence:"+sequence+",tags:"+jPushMessage.getTags());
|
||||
Logger.i(TAG,"tags size:"+jPushMessage.getTags().size());
|
||||
init(context);
|
||||
//根据sequence从之前操作缓存中获取缓存记录
|
||||
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
if(tagAliasBean == null){
|
||||
// Utils.showToast("获取缓存记录失败", context);
|
||||
return;
|
||||
}
|
||||
if(jPushMessage.getErrorCode() == 0){
|
||||
Logger.i(TAG,"action - modify tag Success,sequence:"+sequence);
|
||||
setActionCache.remove(sequence);
|
||||
String logs = getActionStr(tagAliasBean.action)+" tags success";
|
||||
Logger.i(TAG,logs);
|
||||
Utils.showToast(logs, context);
|
||||
}else{
|
||||
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
|
||||
if(jPushMessage.getErrorCode() == 6018){
|
||||
//tag数量超过限制,需要先清除一部分再add
|
||||
logs += ", tags is exceed limit need to clean";
|
||||
}
|
||||
logs += ", errorCode:" + jPushMessage.getErrorCode();
|
||||
Logger.e(TAG, logs);
|
||||
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
Utils.showToast(logs, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
|
||||
int sequence = jPushMessage.getSequence();
|
||||
Logger.i(TAG,"action - onCheckTagOperatorResult, sequence:"+sequence+",checktag:"+jPushMessage.getCheckTag());
|
||||
init(context);
|
||||
//根据sequence从之前操作缓存中获取缓存记录
|
||||
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
if(tagAliasBean == null){
|
||||
// Utils.showToast("获取缓存记录失败", context);
|
||||
return;
|
||||
}
|
||||
if(jPushMessage.getErrorCode() == 0){
|
||||
Logger.i(TAG,"tagBean:"+tagAliasBean);
|
||||
setActionCache.remove(sequence);
|
||||
String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
|
||||
Logger.i(TAG,logs);
|
||||
Utils.showToast(logs, context);
|
||||
}else{
|
||||
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
|
||||
Logger.e(TAG, logs);
|
||||
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
Utils.showToast(logs, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
int sequence = jPushMessage.getSequence();
|
||||
Logger.i(TAG,"action - onAliasOperatorResult, sequence:"+sequence+",alias:"+jPushMessage.getAlias());
|
||||
init(context);
|
||||
//根据sequence从之前操作缓存中获取缓存记录
|
||||
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
if(tagAliasBean == null){
|
||||
// Utils.showToast("获取缓存记录失败", context);
|
||||
return;
|
||||
}
|
||||
if(jPushMessage.getErrorCode() == 0){
|
||||
Logger.i(TAG,"action - modify alias Success,sequence:"+sequence);
|
||||
setActionCache.remove(sequence);
|
||||
String logs = getActionStr(tagAliasBean.action)+" alias success";
|
||||
Logger.i(TAG,logs);
|
||||
Utils.showToast(logs, context);
|
||||
}else{
|
||||
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
|
||||
Logger.e(TAG, logs);
|
||||
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
Utils.showToast(logs, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
//设置手机号码回调
|
||||
public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
int sequence = jPushMessage.getSequence();
|
||||
Logger.i(TAG,"action - onMobileNumberOperatorResult, sequence:"+sequence+",mobileNumber:"+jPushMessage.getMobileNumber());
|
||||
init(context);
|
||||
if(jPushMessage.getErrorCode() == 0){
|
||||
Logger.i(TAG,"action - set mobile number Success,sequence:"+sequence);
|
||||
setActionCache.remove(sequence);
|
||||
}else{
|
||||
String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
|
||||
Logger.e(TAG, logs);
|
||||
if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
|
||||
Utils.showToast(logs, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
public static class TagAliasBean{
|
||||
int action;
|
||||
Set<String> tags;
|
||||
String alias;
|
||||
boolean isAliasAction;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TagAliasBean{" +
|
||||
"action=" + action +
|
||||
", tags=" + tags +
|
||||
", alias='" + alias + '\'' +
|
||||
", isAliasAction=" + isAliasAction +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,1054 +0,0 @@
|
||||
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.login;
|
||||
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.CountDownTimer;
|
||||
import android.os.Handler;
|
||||
import android.text.Html;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.TextUtils;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
import androidx.activity.result.contract.ActivityResultContracts;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.RequiresApi;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.CustomTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityRegisterBfBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.SelectCountryDialog;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.model.CountryBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.PassWordLoginBean;
|
||||
import com.dskj.rbchat.model.RegisteredBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.TaiWanIDCardUtils;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.PictureMimeType;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
import com.luck.picture.lib.engine.CropFileEngine;
|
||||
import com.luck.picture.lib.entity.LocalMedia;
|
||||
import com.luck.picture.lib.interfaces.OnResultCallbackListener;
|
||||
import com.luck.picture.lib.style.BottomNavBarStyle;
|
||||
import com.luck.picture.lib.style.PictureSelectorStyle;
|
||||
import com.luck.picture.lib.style.SelectMainStyle;
|
||||
import com.luck.picture.lib.style.TitleBarStyle;
|
||||
import com.luck.picture.lib.utils.StyleUtils;
|
||||
import com.netease.nimlib.sdk.auth.LoginInfo;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
|
||||
import com.netease.yunxin.kit.chatkit.ui.dialog.PermissionExplainDialog;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
|
||||
import com.yalantis.ucrop.UCrop;
|
||||
import com.yalantis.ucrop.UCropImageEngine;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import cn.iwgang.simplifyspan.customspan.CustomClickableSpan;
|
||||
import cn.iwgang.simplifyspan.other.CustomLinkMovementMethod;
|
||||
import cn.iwgang.simplifyspan.unit.SpecialClickableUnit;
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
|
||||
/**
|
||||
* Welcome Page is launch page
|
||||
*/
|
||||
@Deprecated
|
||||
public class RegisterActivityBf extends BaseActivity {
|
||||
protected ActivityResultLauncher<String[]> permissionLauncher;
|
||||
String passwordCode = null;
|
||||
|
||||
private static final String TAG = "WelcomeActivity";
|
||||
private ActivityRegisterBfBinding activityWelcomeBinding;
|
||||
int step = 1;
|
||||
int sexType = 1;
|
||||
CountryBean countryBean;
|
||||
String avater = null;
|
||||
long lastTime =0;
|
||||
PermissionExplainDialog permissionExplainDialog;
|
||||
|
||||
@RequiresApi(api = Build.VERSION_CODES.M)
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
|
||||
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
|
||||
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "onCreateView");
|
||||
IMApplication.setColdStart(true);
|
||||
activityWelcomeBinding = ActivityRegisterBfBinding.inflate(getLayoutInflater());
|
||||
setContentView(activityWelcomeBinding.getRoot());
|
||||
myCountDownTimer = new MyCountDownTimer(60000, 1000);
|
||||
|
||||
activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
|
||||
onBackPressed();
|
||||
});
|
||||
setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
|
||||
|
||||
countryBean = DataUtils.getLocCountry(RegisterActivityBf.this);
|
||||
changeArea();
|
||||
activityWelcomeBinding.areaTv.setOnClickListener(v -> {
|
||||
SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivityBf.this);
|
||||
selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
|
||||
@Override
|
||||
public void toType(CountryBean type) {
|
||||
countryBean = type;
|
||||
changeArea();
|
||||
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
|
||||
}
|
||||
});
|
||||
selectCountryDialog.show();
|
||||
});
|
||||
activityWelcomeBinding.nextIv.setOnClickListener(v -> {
|
||||
if(lastTime>0){
|
||||
if(System.currentTimeMillis()-lastTime<2000){
|
||||
return;
|
||||
}
|
||||
}
|
||||
lastTime = System.currentTimeMillis();
|
||||
if (step < 5) {
|
||||
if (step == 1) {
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.phoneEt.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.sjhbnwk_txt);
|
||||
return;
|
||||
}
|
||||
checkPhone();
|
||||
} else if (step == 2) {
|
||||
if (TextUtils.isEmpty(passwordCode)||passwordCode.length()!=4) {
|
||||
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
|
||||
return;
|
||||
}
|
||||
checkVerfyCode();
|
||||
} else if (step == 3) {
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.mimabunengweikong_txt);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!DataUtils.checkPassword(activityWelcomeBinding.passwordEt.getText().toString().trim())){
|
||||
ToastX.showShortToast(R.string.qjcmmgs_txt);
|
||||
return;
|
||||
}
|
||||
|
||||
if(activityWelcomeBinding.passwordEt.getText().toString().trim().length()<8){
|
||||
ToastX.showShortToast(R.string.qjcmmgs_txt1);
|
||||
return;
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.qrmmbnwk_txt);
|
||||
return;
|
||||
}
|
||||
if (!activityWelcomeBinding.passwordEt.getText().toString().trim().equals(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.mimaquernemimabuyizhi_txt);
|
||||
return;
|
||||
}
|
||||
hideSoftInput(this);
|
||||
new Handler().postDelayed(() -> {
|
||||
step += 1;
|
||||
changeStep();
|
||||
}, 500);
|
||||
}else if (step == 4) {
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.nicknameEt.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.nichengbunengweik_txt);
|
||||
return;
|
||||
}
|
||||
|
||||
hideSoftInput(this);
|
||||
new Handler().postDelayed(() -> {
|
||||
step += 1;
|
||||
changeStep();
|
||||
}, 500);
|
||||
}
|
||||
|
||||
} else {
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.trueNameEt.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.zhenshixingmingbunengweik_txt);
|
||||
return;
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(activityWelcomeBinding.cardNumberEt.getText().toString().trim())) {
|
||||
ToastX.showShortToast(R.string.shenfenzbunengwiek_txt);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!TaiWanIDCardUtils.checkTaiWanIdCardNumber(activityWelcomeBinding.cardNumberEt.getText().toString().trim())){
|
||||
ToastX.showShortToast(R.string.qsrzqsfzh_txt);
|
||||
|
||||
return ;
|
||||
}
|
||||
|
||||
hideSoftInput(this);
|
||||
phoneRegister();
|
||||
// loginIM(account, token);
|
||||
}
|
||||
});
|
||||
activityWelcomeBinding.changeSmsCodeTv.setOnClickListener(v -> {
|
||||
step = 3;
|
||||
changeStep();
|
||||
});
|
||||
|
||||
activityWelcomeBinding.changePassTv.setOnClickListener(v -> {
|
||||
step = 2;
|
||||
changeStep();
|
||||
});
|
||||
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
|
||||
passwordCode = code;
|
||||
|
||||
});
|
||||
|
||||
|
||||
activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
|
||||
toStep2();
|
||||
});
|
||||
|
||||
activityWelcomeBinding.headRy.setOnClickListener(v -> {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
if (PermissionUtils.hasPermissions(
|
||||
RegisterActivityBf.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
|
||||
startPickMedia();
|
||||
} else {
|
||||
permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
|
||||
permissionExplainDialog.show();
|
||||
permissionLauncher.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO});
|
||||
|
||||
}
|
||||
} else {
|
||||
if (PermissionUtils.hasPermissions(
|
||||
RegisterActivityBf.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
|
||||
startPickMedia();
|
||||
} else {
|
||||
permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
|
||||
permissionExplainDialog.show();
|
||||
permissionLauncher.launch(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE});
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
|
||||
activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
|
||||
activityWelcomeBinding.nvIv.setOnClickListener(v -> changeSex(0));
|
||||
activityWelcomeBinding.nvTv.setOnClickListener(v -> changeSex(0));
|
||||
|
||||
AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
|
||||
activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv, activityWelcomeBinding.areaTv,
|
||||
activityWelcomeBinding.headRy, activityWelcomeBinding.nanIv, activityWelcomeBinding.nvIv);
|
||||
|
||||
permissionLauncher =
|
||||
registerForActivityResult(
|
||||
new ActivityResultContracts.RequestMultiplePermissions(),
|
||||
result -> {
|
||||
if (result != null) {
|
||||
for (Map.Entry<String, Boolean> entry : result.entrySet()) {
|
||||
String permission = entry.getKey().toString();
|
||||
boolean grant = (Boolean) entry.getValue();
|
||||
if (grant) {
|
||||
if (TextUtils.equals(
|
||||
permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
|
||||
permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
|
||||
permission, Manifest.permission.READ_MEDIA_VIDEO)) {
|
||||
startPickMedia();
|
||||
}
|
||||
} else {
|
||||
if (shouldShowRequestPermissionRationale(permission)) {
|
||||
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_deny_tips));
|
||||
} else {
|
||||
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (permissionExplainDialog != null) {
|
||||
permissionExplainDialog.dismiss();
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private void checkVerfyCode() {
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
maps.put("verifyCode", passwordCode);
|
||||
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
}
|
||||
Api.getInstance().preCheckVerifyCode(maps)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<RegisteredBean>>() {
|
||||
|
||||
@Override
|
||||
public void onSuccess(Result<RegisteredBean> feedbackResp) {
|
||||
// dimessLoadingDialog();
|
||||
if (feedbackResp.data.isCorrect()) {
|
||||
new Handler().postDelayed(() -> {
|
||||
step += 1;
|
||||
changeStep();
|
||||
}, 500);
|
||||
} else {
|
||||
ToastX.showShortToast(R.string.yzmbzq_txt);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
ToastX.showShortToast( msg);
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void checkPhone() {
|
||||
hideSoftInput(RegisterActivityBf.this);
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
}
|
||||
Api.getInstance().registered(maps)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<RegisteredBean>>() {
|
||||
|
||||
@Override
|
||||
public void onSuccess(Result<RegisteredBean> feedbackResp) {
|
||||
if (!feedbackResp.data.isRegistered()) {
|
||||
// checkVerfyCode();
|
||||
new Handler().postDelayed(() -> {
|
||||
step += 1;
|
||||
changeStep();
|
||||
}, 500);
|
||||
|
||||
} else {
|
||||
ToastX.showShortToast(R.string.yzczjdl_txt);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
ToastX.showShortToast(msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private void phoneRegister() {
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
maps.put("nickname", activityWelcomeBinding.nicknameEt.getText().toString().trim());
|
||||
maps.put("password", activityWelcomeBinding.passwordEt.getText().toString().trim());
|
||||
maps.put("verifyCode", passwordCode);
|
||||
if (!TextUtils.isEmpty(avater)) {
|
||||
maps.put("avatar", avater);
|
||||
}
|
||||
maps.put("sex", sexType);
|
||||
maps.put("realName", activityWelcomeBinding.trueNameEt.getText().toString().trim());
|
||||
maps.put("idCard", activityWelcomeBinding.cardNumberEt.getText().toString().trim());
|
||||
|
||||
if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
}
|
||||
Api.getInstance().phoneRegister(maps)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
doLogin();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
ToastX.showShortToast(msg);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 实施登录的方法.
|
||||
* <p>
|
||||
* 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理.
|
||||
*
|
||||
*/
|
||||
private void doLogin() {
|
||||
|
||||
String uidOrMail = String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim().toLowerCase();
|
||||
String loginPsw = String.valueOf(activityWelcomeBinding.passwordEt.getText()).trim();
|
||||
|
||||
PassWordLoginBean passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
|
||||
GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this),IMUIKitConfig.SUBSTATIONID);
|
||||
if(TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)){
|
||||
passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
|
||||
GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this));
|
||||
}
|
||||
Api.getInstance().passwordLogin(passWordLoginBean)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<>() {
|
||||
|
||||
@Override
|
||||
public void onSuccess(Result<LoginBean> feedbackResp) {
|
||||
|
||||
if(TextUtils.isEmpty(feedbackResp.data.getUser().getChatToken())){
|
||||
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.zhbhf_jqsb_txt), false);
|
||||
actionConfirmDialog.show();
|
||||
return;
|
||||
}
|
||||
|
||||
DataUtils.set(RegisterActivityBf.this,"login_bean", GsonUtils.beanToJSONString(feedbackResp.data));
|
||||
|
||||
loginIM(feedbackResp.data.getUser_uid(),feedbackResp.data.getUser().getChatToken());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
ToastX.showShortToast( msg);
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// AvaterBean avaterBean = null;
|
||||
//
|
||||
// private void updateImage(File file) {
|
||||
// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
|
||||
// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("file", file.getName(), imageBody);
|
||||
// Api.getInstance().uploadUserAvatar(imageBodyPart)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<AvaterBean>>() {
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(Result<AvaterBean> feedbackResp) {
|
||||
// avaterBean = feedbackResp.data;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
|
||||
private void toStep2() {
|
||||
hideSoftInput(RegisterActivityBf.this);
|
||||
Map<String, String> maps = new HashMap<>();
|
||||
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
}
|
||||
Api.getInstance().sendSmsForRegister(maps)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<String>>() {
|
||||
|
||||
@Override
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
myCountDownTimer.start();
|
||||
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.yzmyfs_txt), false);
|
||||
actionConfirmDialog.show();
|
||||
activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt1),
|
||||
countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
ToastX.showShortToast(msg);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
MyCountDownTimer myCountDownTimer;
|
||||
|
||||
//倒计时函数
|
||||
private class MyCountDownTimer extends CountDownTimer {
|
||||
|
||||
public MyCountDownTimer(long millisInFuture, long countDownInterval) {
|
||||
super(millisInFuture, countDownInterval);
|
||||
}
|
||||
|
||||
//计时过程
|
||||
@Override
|
||||
public void onTick(long l) {
|
||||
//防止计时过程中重复点击
|
||||
activityWelcomeBinding.sendSmsTv.setClickable(false);
|
||||
// getcodeTv.setTextColor(getResources().getColor(R.color.color_adb5bd));
|
||||
activityWelcomeBinding.sendSmsTv.setText(String.format(getString(R.string.get_code1_txt), (l / 1000)));
|
||||
|
||||
}
|
||||
|
||||
//计时完毕的方法
|
||||
@Override
|
||||
public void onFinish() {
|
||||
//重新给Button设置文字
|
||||
activityWelcomeBinding.sendSmsTv.setText(R.string.get_code_txt);
|
||||
//设置可点击
|
||||
activityWelcomeBinding.sendSmsTv.setClickable(true);
|
||||
// getcodeTv.setTextColor(getResources().getColor(R.color.colorAccent));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 隐藏软键盘
|
||||
*/
|
||||
public void hideSoftInput(Activity activity) {
|
||||
InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
|
||||
if (getCurrentFocus() != null && null != imm) {
|
||||
imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
|
||||
}
|
||||
// View view = activity.getCurrentFocus();
|
||||
//
|
||||
// if (view != null) {
|
||||
//
|
||||
// InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
|
||||
//
|
||||
// inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
private void changeSex(int i) {
|
||||
sexType = i;
|
||||
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_f);
|
||||
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_f);
|
||||
if (i == 1) {
|
||||
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_t);
|
||||
} else {
|
||||
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_t);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
if (step == 1) {
|
||||
super.onBackPressed();
|
||||
} else {
|
||||
step -= 1;
|
||||
changeStep();
|
||||
}
|
||||
}
|
||||
|
||||
private void changeStep() {
|
||||
switch (step) {
|
||||
case 1:
|
||||
activityWelcomeBinding.step1Ly.setVisibility(View.VISIBLE);
|
||||
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
break;
|
||||
case 2:
|
||||
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step3Ly.setVisibility(View.VISIBLE);
|
||||
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt),
|
||||
countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
|
||||
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
|
||||
break;
|
||||
case 3:
|
||||
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step2Ly.setVisibility(View.VISIBLE);
|
||||
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
|
||||
break;
|
||||
|
||||
case 4:
|
||||
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step4Ly.setVisibility(View.VISIBLE);
|
||||
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
|
||||
break;
|
||||
|
||||
case 5:
|
||||
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.step5Ly.setVisibility(View.VISIBLE);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
PictureSelectorStyle selectorStyle;
|
||||
LocalMedia localMedia = null;
|
||||
|
||||
protected void startPickMedia() {
|
||||
// pickMediaLauncher.launch("image/*;video/*");
|
||||
|
||||
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
|
||||
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down);
|
||||
whiteTitleBarStyle.setTitleLeftBackResource(com.netease.yunxin.kit.common.ui.R.drawable.ic_back);
|
||||
whiteTitleBarStyle.setTitleTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
|
||||
whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
whiteTitleBarStyle.setDisplayTitleBarLine(true);
|
||||
|
||||
BottomNavBarStyle whiteBottomNavBarStyle = new BottomNavBarStyle();
|
||||
whiteBottomNavBarStyle.setBottomNarBarBackgroundColor(Color.parseColor("#FFFFFF"));
|
||||
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
|
||||
whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
|
||||
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
|
||||
whiteBottomNavBarStyle.setCompleteCountTips(false);
|
||||
whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
|
||||
SelectMainStyle selectMainStyle = new SelectMainStyle();
|
||||
selectMainStyle.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
selectMainStyle.setDarkStatusBarBlack(true);
|
||||
selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
|
||||
selectMainStyle.setSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
|
||||
selectMainStyle.setPreviewSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_demo_white_preview_selector);
|
||||
selectMainStyle.setSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_checkbox_selector);
|
||||
// selectMainStyle.setSelectText(R.string.ps_done_front_num);
|
||||
selectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
selectorStyle = new PictureSelectorStyle();
|
||||
selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
|
||||
selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
|
||||
selectorStyle.setSelectMainStyle(selectMainStyle);
|
||||
|
||||
|
||||
PictureSelector.create(this)
|
||||
.openGallery(SelectMimeType.ofImage())
|
||||
.setImageEngine(GlideEngine.createGlideEngine())
|
||||
.setCropEngine(new ImageFileCropEngine())
|
||||
.setMaxSelectNum(1)
|
||||
.setSelectorUIStyle(selectorStyle)
|
||||
.forResult(new OnResultCallbackListener<>() {
|
||||
@Override
|
||||
public void onResult(ArrayList<LocalMedia> result) {
|
||||
if (result.size() > 0) {
|
||||
Glide.with(RegisterActivityBf.this)
|
||||
.load(result.get(0).getAvailablePath())
|
||||
.apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
|
||||
.into(activityWelcomeBinding.headIv);
|
||||
localMedia = result.get(0);
|
||||
toShangchuanAli(new File(result.get(0).getAvailablePath()));
|
||||
// updateImage(new File(result.get(0).getAvailablePath()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCancel() {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 自定义裁剪
|
||||
*/
|
||||
private class ImageFileCropEngine implements CropFileEngine {
|
||||
|
||||
@Override
|
||||
public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
|
||||
UCrop.Options options = buildOptions();
|
||||
UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
|
||||
uCrop.withOptions(options);
|
||||
uCrop.setImageEngine(new UCropImageEngine() {
|
||||
@Override
|
||||
public void loadImage(Context context, String url, ImageView imageView) {
|
||||
if (!AppUtils.assertValidRequest(context)) {
|
||||
return;
|
||||
}
|
||||
Glide.with(context).load(url).override(180, 180).into(imageView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
|
||||
Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() {
|
||||
@Override
|
||||
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
|
||||
if (call != null) {
|
||||
call.onCall(resource);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadCleared(@Nullable Drawable placeholder) {
|
||||
if (call != null) {
|
||||
call.onCall(null);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
uCrop.start(fragment.requireActivity(), fragment, requestCode);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 配制UCrop，可根据需求自我扩展
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
private UCrop.Options buildOptions() {
|
||||
UCrop.Options options = new UCrop.Options();
|
||||
options.setHideBottomControls(false);
|
||||
options.setFreeStyleCropEnabled(true);
|
||||
options.setShowCropFrame(true);
|
||||
options.setShowCropGrid(true);
|
||||
options.setCircleDimmedLayer(false);
|
||||
options.withAspectRatio(1, 1);
|
||||
options.setCropOutputPathDir(getSandboxPath());
|
||||
options.isCropDragSmoothToCenter(false);
|
||||
options.setSkipCropMimeType(new String[]{PictureMimeType.ofGIF(), PictureMimeType.ofWEBP()});
|
||||
options.isForbidCropGifWebp(true);
|
||||
options.isForbidSkipMultipleCrop(true);
|
||||
options.setMaxScaleMultiplier(100);
|
||||
if (selectorStyle != null && selectorStyle.getSelectMainStyle().getStatusBarColor() != 0) {
|
||||
SelectMainStyle mainStyle = selectorStyle.getSelectMainStyle();
|
||||
boolean isDarkStatusBarBlack = mainStyle.isDarkStatusBarBlack();
|
||||
int statusBarColor = mainStyle.getStatusBarColor();
|
||||
options.isDarkStatusBarBlack(isDarkStatusBarBlack);
|
||||
if (StyleUtils.checkStyleValidity(statusBarColor)) {
|
||||
options.setStatusBarColor(statusBarColor);
|
||||
options.setToolbarColor(statusBarColor);
|
||||
} else {
|
||||
options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
}
|
||||
TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
|
||||
if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
|
||||
options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
|
||||
} else {
|
||||
options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
|
||||
}
|
||||
} else {
|
||||
options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
|
||||
}
|
||||
return options;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建自定义输出目录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
private String getSandboxPath() {
|
||||
File externalFilesDir = getExternalFilesDir("");
|
||||
File customFile = new File(externalFilesDir.getAbsolutePath(), "Sandbox");
|
||||
if (!customFile.exists()) {
|
||||
customFile.mkdirs();
|
||||
}
|
||||
return customFile.getAbsolutePath() + File.separator;
|
||||
}
|
||||
|
||||
|
||||
private void changeArea() {
|
||||
activityWelcomeBinding.areaTv.setText(countryBean.getCountryName() + countryBean.getAreaCodeName());
|
||||
}
|
||||
|
||||
private void showMainActivityAndFinish() {
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
|
||||
Intent intent = new Intent();
|
||||
intent.setClass(this, MainActivity.class);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
this.startActivity(intent);
|
||||
finish();
|
||||
}
|
||||
|
||||
|
||||
private void loginIM(String account, String token) {
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
LoginInfo loginInfo =
|
||||
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
|
||||
.withAppKey(DataUtils.readAppKey(this))
|
||||
.build();
|
||||
IMKitClient.loginIM(
|
||||
loginInfo,
|
||||
new LoginCallback<LoginInfo>() {
|
||||
@Override
|
||||
public void onError(int errorCode, @NonNull String errorMsg) {
|
||||
ToastX.showShortToast(
|
||||
String.format(getResources().getString(R.string.login_fail), errorCode));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(@Nullable LoginInfo data) {
|
||||
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
|
||||
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_TOKEN, token);
|
||||
showMainActivityAndFinish();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setPrivacyContent(TextView contentView) {
|
||||
|
||||
SpannableStringBuilder stringBuilder = new SpannableStringBuilder(getString(R.string.denglujitongyi_txt));
|
||||
|
||||
int len = stringBuilder.length();
|
||||
|
||||
stringBuilder.append(getString(R.string.fuwuxieyi_txt));
|
||||
|
||||
SpecialClickableUnit unit = new SpecialClickableUnit(contentView,
|
||||
(tv, clickableSpan) -> {
|
||||
BrowseActivity.Companion.launch(
|
||||
RegisterActivityBf.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_SERVICE_CN_URL);
|
||||
});
|
||||
unit.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
unit.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
unit.showUnderline();
|
||||
CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
|
||||
stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
stringBuilder.append(getString(R.string.yiji_txt));
|
||||
len = stringBuilder.length();
|
||||
stringBuilder.append(getString(R.string.yinsizhengche_txt));
|
||||
SpecialClickableUnit unit1 = new SpecialClickableUnit(contentView,
|
||||
(tv, clickableSpan) -> {
|
||||
BrowseActivity.Companion.launch(
|
||||
RegisterActivityBf.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
|
||||
});
|
||||
unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
unit1.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
unit1.showUnderline();
|
||||
CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
|
||||
stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
|
||||
contentView.setText(stringBuilder);
|
||||
contentView.setClickable(false);
|
||||
contentView.setMovementMethod(CustomLinkMovementMethod.getInstance());//不设置 没有点击事件
|
||||
contentView.setHighlightColor(Color.TRANSPARENT); //设置点击后的颜色为透明
|
||||
contentView.setMovementMethod(LinkMovementMethod.getInstance());//不设置点击会失效
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
StsCredentialsBean stsCredentialsBean;
|
||||
|
||||
private void toShangchuanAli(File file ) {
|
||||
showLoadingDialog();
|
||||
Api.getInstance().stsCredentials()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss(file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
dimessLoadingDialog();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private void toAliYunOss(File file ) {
|
||||
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
String bucketName = IMUIKitConfig.bucketName;
|
||||
|
||||
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
toUpdateOss(bucketName, 0, oss, file);
|
||||
|
||||
}
|
||||
public static Handler handler = new Handler();
|
||||
|
||||
//
|
||||
private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
|
||||
LogUtils.i("1111111111111111111");
|
||||
String updatePathPicHead = "userAvatarFileName";
|
||||
|
||||
LogUtils.i("22222222222222222");
|
||||
|
||||
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
|
||||
LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
|
||||
LogUtils.i("文件地址是啥1：" + file.getPath());
|
||||
|
||||
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
|
||||
|
||||
put.setProgressCallback((request, currentSize, totalSize) -> {
|
||||
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
|
||||
|
||||
});
|
||||
LogUtils.i("55555555555555");
|
||||
|
||||
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
|
||||
@Override
|
||||
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
|
||||
LogUtils.i("PutObject", "UploadSuccess");
|
||||
LogUtils.i("ETag", result.getETag());
|
||||
LogUtils.i("RequestId", result.getRequestId());
|
||||
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
|
||||
|
||||
handler.post(() -> {
|
||||
dimessLoadingDialog();
|
||||
avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
|
||||
dimessLoadingDialog();
|
||||
LogUtils.i("ErrorCode", clientExcepion.getMessage());
|
||||
|
||||
// 请求异常。
|
||||
if (clientExcepion != null) {
|
||||
// 本地异常，如网络异常等。
|
||||
clientExcepion.printStackTrace();
|
||||
}
|
||||
if (serviceException != null) {
|
||||
// 服务异常。
|
||||
LogUtils.i("ErrorCode", serviceException.getErrorCode());
|
||||
LogUtils.i("RequestId", serviceException.getRequestId());
|
||||
LogUtils.i("HostId", serviceException.getHostId());
|
||||
LogUtils.i("RawMessage", serviceException.getRawMessage());
|
||||
}
|
||||
}
|
||||
});
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public LoadingDialog loadingDialog;
|
||||
|
||||
public void showLoadingDialog() {
|
||||
if (loadingDialog == null)
|
||||
loadingDialog = new LoadingDialog(this);
|
||||
loadingDialog.show();
|
||||
}
|
||||
|
||||
public void showLoadingDialog(String msg) {
|
||||
if (loadingDialog == null)
|
||||
loadingDialog = new LoadingDialog(this);
|
||||
loadingDialog.setLoadingText(msg);
|
||||
loadingDialog.show();
|
||||
}
|
||||
|
||||
|
||||
public void dimessLoadingDialog() {
|
||||
if (loadingDialog != null) {
|
||||
loadingDialog.dismiss();
|
||||
}
|
||||
|
||||
}
|
||||
public boolean onTouchEvent(MotionEvent event) {
|
||||
if(null != this.getCurrentFocus()){
|
||||
/**
|
||||
* 点击空白位置 隐藏软键盘
|
||||
*/
|
||||
InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
|
||||
return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
|
||||
}
|
||||
return super .onTouchEvent(event);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main;
|
||||
|
||||
import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
|
||||
import com.netease.nimlib.sdk.msg.MessageBuilder;
|
||||
import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment;
|
||||
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
|
||||
import com.netease.nimlib.sdk.msg.model.IMMessage;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.alog.ParameterMap;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
|
||||
import com.netease.yunxin.kit.common.utils.NetworkUtils;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.model.impl.DefaultCallOrderImpl;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.model.impl.state.CallState;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.utils.CallParams;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.utils.NrtcCallStatus;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
class CustomCallOrderHelper extends DefaultCallOrderImpl {
|
||||
private static final String TAG = "CustomCallOrderHelper";
|
||||
|
||||
@Override
|
||||
public void onCanceled(ChannelType channelType, String accountId, int callType) {
|
||||
ALog.dApi(
|
||||
TAG,
|
||||
new ParameterMap("onCanceled")
|
||||
.append("channelType", channelType)
|
||||
.append("callType", callType)
|
||||
.append("accountId", accountId)
|
||||
.append("enableOrder", isEnable())
|
||||
.toValue());
|
||||
if (!isEnable()) {
|
||||
return;
|
||||
}
|
||||
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReject(ChannelType channelType, String accountId, int callType) {
|
||||
ALog.dApi(
|
||||
TAG,
|
||||
new ParameterMap("onReject")
|
||||
.append("channelType", channelType)
|
||||
.append("callType", callType)
|
||||
.append("accountId", accountId)
|
||||
.append("enableOrder", isEnable())
|
||||
.toValue());
|
||||
if (!isEnable()) {
|
||||
return;
|
||||
}
|
||||
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusRejected, callType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTimeout(ChannelType channelType, String accountId, int callType) {
|
||||
ALog.dApi(
|
||||
TAG,
|
||||
new ParameterMap("onTimeout")
|
||||
.append("channelType", channelType)
|
||||
.append("callType", callType)
|
||||
.append("accountId", accountId)
|
||||
.append("enableOrder", isEnable())
|
||||
.toValue());
|
||||
if (!isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (NERTCVideoCall.sharedInstance().getCurrentState() == CallState.STATE_INVITED) {
|
||||
return;
|
||||
}
|
||||
if (NetworkUtils.isConnected()) {
|
||||
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusTimeout, callType);
|
||||
} else {
|
||||
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBusy(ChannelType channelType, String accountId, int callType) {
|
||||
ALog.dApi(
|
||||
TAG,
|
||||
new ParameterMap("onBusy")
|
||||
.append("channelType", channelType)
|
||||
.append("callType", callType)
|
||||
.append("accountId", accountId)
|
||||
.append("enableOrder", isEnable())
|
||||
.toValue());
|
||||
if (!isEnable()) {
|
||||
return;
|
||||
}
|
||||
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusBusy, callType);
|
||||
}
|
||||
|
||||
public static void sendOrder(
|
||||
ChannelType channelType, String accountId, int status, int callType) {
|
||||
sendOrder(channelType, accountId, status, Collections.emptyList(), callType);
|
||||
}
|
||||
|
||||
public static void sendOrder(
|
||||
ChannelType channelType,
|
||||
String accountId,
|
||||
int status,
|
||||
List<NetCallAttachment.Duration> durations,
|
||||
int callType) {
|
||||
ALog.dApi(
|
||||
TAG,
|
||||
new ParameterMap("sendOrder")
|
||||
.append("status", status)
|
||||
.append("channelType", channelType)
|
||||
.append("callType", callType)
|
||||
.append("durations", durations)
|
||||
.append("accountId", accountId)
|
||||
.toValue());
|
||||
if (callType == CallParams.CallType.P2P) {
|
||||
NetCallAttachment netCallAttachment =
|
||||
new NetCallAttachment.NetCallAttachmentBuilder()
|
||||
.withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue())
|
||||
.withStatus(status)
|
||||
.withDurations(durations)
|
||||
.build();
|
||||
IMMessage message =
|
||||
MessageBuilder.createNrtcNetcallMessage(
|
||||
accountId, SessionTypeEnum.P2P, netCallAttachment);
|
||||
ChatRepo.sendMessage(message, true, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,390 +0,0 @@
|
||||
package com.dskj.rbchat.main.index;
|
||||
|
||||
import static android.widget.RelativeLayout.ALIGN_PARENT_END;
|
||||
import static android.widget.RelativeLayout.ALIGN_PARENT_START;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.util.JsonWriter;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.inputmethod.EditorInfo;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.base.LllChatBaseActivity;
|
||||
import com.dskj.rbchat.databinding.ActivityAichatBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.model.AiConvertBean;
|
||||
import com.dskj.rbchat.model.AiMessageBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionActivity;
|
||||
import com.dskj.rbchat.utils.FileUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.KeyboardUtil;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ShareDateUtils;
|
||||
import com.google.android.gms.common.util.JsonUtils;
|
||||
import com.google.android.gms.common.util.SharedPreferencesUtils;
|
||||
import com.google.gson.JsonParser;
|
||||
import com.iflytek.sparkchain.core.LLM;
|
||||
import com.iflytek.sparkchain.core.LLMCallbacks;
|
||||
import com.iflytek.sparkchain.core.LLMError;
|
||||
import com.iflytek.sparkchain.core.LLMEvent;
|
||||
import com.iflytek.sparkchain.core.LLMResult;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.msg.MsgService;
|
||||
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
|
||||
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.Node;
|
||||
import org.w3c.dom.NodeList;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.FileReader;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
import javax.xml.transform.OutputKeys;
|
||||
import javax.xml.transform.Transformer;
|
||||
import javax.xml.transform.TransformerFactory;
|
||||
import javax.xml.transform.dom.DOMSource;
|
||||
import javax.xml.transform.stream.StreamResult;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
|
||||
public class AiChatActivity extends LllChatBaseActivity {
|
||||
|
||||
ActivityAichatBinding binding;
|
||||
public LLM llm;
|
||||
public CommonAdapter commonAdapter;
|
||||
private StringBuilder stringBuilderContent = new StringBuilder();
|
||||
private ArrayList<AiMessageBean> chatMessageBeans = new ArrayList<>();
|
||||
private boolean isAichat = false;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
binding = ActivityAichatBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
llm = IMApplication.getInstance().llm;
|
||||
if (llm != null) {
|
||||
llm.registerLLMCallbacks(new LLMCallbacks() {
|
||||
@Override
|
||||
public void onLLMResult(LLMResult llmResult, Object o) {
|
||||
stringBuilderContent.append(llmResult.getContent());
|
||||
int status = llmResult.getStatus(); //status 为2
|
||||
if (status == 2) {
|
||||
AiChatEnd();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLLMEvent(LLMEvent llmEvent, Object o) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLLMError(LLMError llmError, Object o) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
initView();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int initNavigationBarColor() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int initStatusBarColor() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public void AiChatEnd() {
|
||||
//結束了對話
|
||||
// dismissLoading();
|
||||
if (!TextUtils.isEmpty(stringBuilderContent.toString())) {
|
||||
runOnUiThread(() -> {
|
||||
// AiMessageBean bean = new AiMessageBean(replaceContent(stringBuilderContent.toString()), true);
|
||||
int size = commonAdapter.getDates().size();
|
||||
AiMessageBean bean = (AiMessageBean) commonAdapter.getDates().get(size - 1);
|
||||
if (!bean.isAi()) {
|
||||
String value = replaceContent(stringBuilderContent.toString());
|
||||
convertContent(value, new CallbackListener() {
|
||||
@Override
|
||||
public void setResult(String value) {
|
||||
AiMessageBean bean = new AiMessageBean(value, true);
|
||||
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
String value = replaceContent(replaceContent(stringBuilderContent.toString()));
|
||||
AiMessageBean finalBean = bean;
|
||||
convertContent(value, new CallbackListener() {
|
||||
@Override
|
||||
public void setResult(String value) {
|
||||
finalBean.setMessage(value);
|
||||
commonAdapter.notifyDataSetChanged();
|
||||
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
stringBuilderContent.delete(0, stringBuilderContent.toString().length());
|
||||
scrollbottom();
|
||||
binding.editInputchat.setFocusable(true);
|
||||
binding.editInputchat.setFocusableInTouchMode(true);
|
||||
isAichat = false;
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public void scrollbottom() {
|
||||
int count = commonAdapter.getItemCount();
|
||||
binding.recyclerChat.post(() -> binding.recyclerChat.scrollToPosition(count > 0 ? count - 1 : 0));
|
||||
}
|
||||
|
||||
public String replaceContent(String content) {
|
||||
if (content.contains("您好，我是科大讯飞研发的认知智能大模型，我的名字叫讯飞星火认知大模型。我可以和人类进行自然交流，解答问题，高效完成各领域认知智能需求。")) {
|
||||
content = getString(R.string.aiintroduct_zh_txt);
|
||||
return content;
|
||||
}
|
||||
if (content.contains("Hello, I am iFLYTEK Spark developed by iFLYTEK, and myHello, I am iFLYTEK Spark developed by iFLYTEK, and my name is iFLYTEK Spark. I can communicate with human beings naturally, answer questions, and efficiently complete the needs of cognitive intelligence in various fields.")) {
|
||||
content = getString(R.string.aiintroduct_en_txt);
|
||||
return content;
|
||||
}
|
||||
content = content.replace("科大讯飞", "小夢");
|
||||
content = content.replace("讯飞", "小夢");
|
||||
content = content.replace("讯飞", "小夢");
|
||||
content = content.replace("科大", "小夢");
|
||||
content = content.replace("iFLYTEK Spark", "XiaoMeng");
|
||||
|
||||
return content;
|
||||
}
|
||||
|
||||
|
||||
private void initView() {
|
||||
binding.titlebarAichat.setActionTextColor(getResources().getColor(R.color.color_themeblue));
|
||||
binding.titlebarAichat.setActionText(getString(R.string.aihistory_clean));
|
||||
binding.titlebarAichat.setActionListener(view -> {
|
||||
if (!isAichat) {
|
||||
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, getString(R.string.aihistory_title), true);
|
||||
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
|
||||
@Override
|
||||
public void toSumbit() {
|
||||
commonAdapter.getDates().clear();
|
||||
chatMessageBeans.clear();
|
||||
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
commonAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toCancel() {
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
actionConfirmDialog.show();
|
||||
}
|
||||
|
||||
});
|
||||
binding.titlebarAichat.setOnBackIconClickListener(view -> onBackPressed());
|
||||
binding.titlebarAichat.setTitle(getString(R.string.ainame_txt));
|
||||
binding.editInputchat.setOnEditorActionListener(
|
||||
(v, actionId, event) -> {
|
||||
if (actionId == EditorInfo.IME_ACTION_SEND) {
|
||||
sendText();
|
||||
}
|
||||
return true;
|
||||
});
|
||||
binding.recyclerChat.setLayoutManager(new LinearLayoutManager(this));
|
||||
commonAdapter = new CommonAdapter<AiMessageBean>(this, R.layout.item_chatai, chatMessageBeans) {
|
||||
|
||||
private TextView tvContent;
|
||||
|
||||
@Override
|
||||
public void convert(ViewHolder holder, AiMessageBean s, int index) {
|
||||
tvContent = holder.getView(R.id.tv_chatcontent);
|
||||
tvContent.setText(s.message);
|
||||
RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
if (s.isAi) {
|
||||
params.addRule(ALIGN_PARENT_START);
|
||||
params.setMargins(20, 20, 100, 20);
|
||||
tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_receive_bg);
|
||||
tvContent.setTextColor(mContext.getResources().getColor(R.color.color_333333));
|
||||
} else {
|
||||
params.addRule(ALIGN_PARENT_END);
|
||||
params.setMargins(100, 20, 20, 20);
|
||||
tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_send_bg);
|
||||
tvContent.setTextColor(mContext.getResources().getColor(android.R.color.black));
|
||||
}
|
||||
tvContent.setLayoutParams(params);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
String value = FileUtils.getChatData(AiChatActivity.this);
|
||||
if (!TextUtils.isEmpty(value)) {
|
||||
List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
|
||||
LogUtils.i("aimessagebean-" + aiMessageBean.size());
|
||||
if (aiMessageBean.size() == 0) {
|
||||
sendHello();
|
||||
}
|
||||
chatMessageBeans.addAll(aiMessageBean);
|
||||
} else {
|
||||
sendHello();
|
||||
}
|
||||
binding.recyclerChat.setAdapter(commonAdapter);
|
||||
scrollbottom();
|
||||
}
|
||||
|
||||
public void sendHello() {
|
||||
AiMessageBean bean = new AiMessageBean(getString(R.string.aihint_txt), true);
|
||||
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
}
|
||||
|
||||
public void sendText() {
|
||||
String value = binding.editInputchat.getText().toString();
|
||||
if (!TextUtils.isEmpty(value)) {
|
||||
startChat(value);
|
||||
binding.editInputchat.setFocusable(false);
|
||||
binding.editInputchat.setFocusableInTouchMode(false);
|
||||
} else {
|
||||
isAichat = false;
|
||||
ToastX.showShortToast("请输入聊天内容");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void startChat(String content) {
|
||||
if (llm == null) {
|
||||
// Log.e(TAG, "startChat failed,please setLLMConfig before!");
|
||||
return;
|
||||
}
|
||||
isAichat = true;
|
||||
String usrInputText = content;
|
||||
//Log.d(TAG, "用户输入：" + usrInputText);
|
||||
// if (usrInputText.length() >= 1)
|
||||
// binding.editInputchat.append("\n输入:\n " + usrInputText + "\n");
|
||||
AiMessageBean bean = new AiMessageBean(content, false);
|
||||
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
AiMessageBean bean2 = new AiMessageBean(getString(R.string.aianswer_txt), true);
|
||||
commonAdapter.addItems(commonAdapter.getDates().size(), bean2);
|
||||
scrollbottom();
|
||||
KeyboardUtil.hideSoftInput(this);
|
||||
String myContext = "myContext";
|
||||
binding.editInputchat.setText("");
|
||||
|
||||
// showLoading();
|
||||
int ret = llm.arun(usrInputText, myContext);
|
||||
if (ret != 0) {
|
||||
dismissLoading();
|
||||
//Log.e(TAG, "SparkChain failed:\n" + ret);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void convertContent(String content, CallbackListener callbackListener) {
|
||||
Api.getInstance().convertzh(1, content, "nxmfxsiggkcw1pbl", "p7UncBBNfLmq1aoajsHB2qnfiznmiMHs")
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<AiConvertBean> o) {
|
||||
if (o.code == 1 && o.data != null) {
|
||||
try {
|
||||
String result = o.data.getConvertContent();
|
||||
callbackListener.setResult(result);
|
||||
} catch (Exception e) {
|
||||
callbackListener.setResult(content);
|
||||
}
|
||||
|
||||
} else {
|
||||
callbackListener.setResult(content);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
callbackListener.setResult(content);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public interface CallbackListener {
|
||||
void setResult(String value);
|
||||
}
|
||||
// private void writeData() {
|
||||
// try {
|
||||
//// if (chatMessageBeans.size() > 100) { //只存100条
|
||||
//// chatMessageBeans.remove(0);
|
||||
//// }
|
||||
// File file = new File(getFilesDir(), chatFileName);
|
||||
// String jsonString = GsonUtils.beanToJSONString(chatMessageBeans);
|
||||
// FileWriter fileWriter = new FileWriter(file, false);
|
||||
// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
|
||||
// bufferedWriter.write(jsonString);
|
||||
// bufferedWriter.close();
|
||||
// } catch (IOException e) {
|
||||
// LogUtils.i(e.getMessage());
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
// @Override
|
||||
// public void onBackPressed() {
|
||||
// Intent intent = new Intent();
|
||||
// intent.putExtra("update", isUpdate);
|
||||
// setResult(RESULT_OK, intent);
|
||||
// finish();
|
||||
//// super.onBackPressed();
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
package com.dskj.rbchat.wxapi;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.wxapi.bean.WeiXin;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
import com.tencent.mm.opensdk.constants.ConstantsAPI;
|
||||
import com.tencent.mm.opensdk.modelbase.BaseReq;
|
||||
import com.tencent.mm.opensdk.modelbase.BaseResp;
|
||||
import com.tencent.mm.opensdk.openapi.IWXAPI;
|
||||
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
|
||||
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
|
||||
|
||||
/**
|
||||
* 微信支付回调Activity
|
||||
* @create time 2017-09-15
|
||||
*/
|
||||
public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
|
||||
private IWXAPI wxAPI;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID);
|
||||
wxAPI.handleIntent(getIntent(), this);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onNewIntent(Intent intent){
|
||||
super.onNewIntent(intent);
|
||||
setIntent(intent);
|
||||
wxAPI.handleIntent(intent, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReq(BaseReq baseReq) {}
|
||||
|
||||
@Override
|
||||
public void onResp(BaseResp resp) {
|
||||
Log.i("ansen", "微信支付回调 返回错误码:"+resp.errCode+" 错误名称:"+resp.errStr);
|
||||
if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX){//微信支付
|
||||
WeiXin weiXin=new WeiXin(3,resp.errCode,"");
|
||||
RxBus.getInstance().post(weiXin);
|
||||
}
|
||||
finish();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -2,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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -2,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();
|
||||
}
|
||||
@@ -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
|
||||
@@ -2,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;
|
||||
@@ -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)
|
||||
@@ -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 {
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.adapter;
|
||||
package com.hbl.lewan.adapter;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.SparseArray;
|
||||
@@ -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 {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.contact;
|
||||
package com.hbl.lewan.contact;
|
||||
|
||||
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.REQUEST_CONTACT_SELECTOR_AVATAR;
|
||||
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_REQUEST_SELECTOR_NAME;
|
||||
@@ -23,8 +23,8 @@ import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.dskj.rbchat.model.UsersExistBean;
|
||||
import com.dskj.rbchat.utils.ShareDateUtils;
|
||||
import com.hbl.lewan.model.UsersExistBean;
|
||||
import com.hbl.lewan.utils.ShareDateUtils;
|
||||
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
|
||||
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
@@ -2,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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.contact;
|
||||
package com.hbl.lewan.contact;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.Context;
|
||||
@@ -30,36 +30,36 @@ import androidx.core.widget.NestedScrollView;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.ActivityTransferInfoBinding;
|
||||
import com.dskj.rbchat.databinding.ReportActivityBinding;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.GroupActionBean;
|
||||
import com.dskj.rbchat.model.ReportBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.KeyboardUtil;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.ActivityTransferInfoBinding;
|
||||
import com.hbl.lewan.databinding.ReportActivityBinding;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.GroupActionBean;
|
||||
import com.hbl.lewan.model.ReportBean;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.KeyboardUtil;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
import com.luck.picture.lib.entity.LocalMedia;
|
||||
@@ -80,11 +80,18 @@ import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
|
||||
import com.qiniu.android.storage.Configuration;
|
||||
import com.qiniu.android.storage.UploadManager;
|
||||
import com.qiniu.android.storage.UploadOptions;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
@@ -254,18 +261,36 @@ public class ReportActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
|
||||
StsCredentialsBean stsCredentialsBean;
|
||||
String stsCredentialsBean;
|
||||
|
||||
private void toShangchuanAli() {
|
||||
showLoadingDialog();
|
||||
Api.getInstance().stsCredentials()
|
||||
// Api.getInstance().stsCredentials()
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
// stsCredentialsBean = feedbackResp.data;
|
||||
// toAliYunOss();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
// }
|
||||
// });
|
||||
|
||||
Api.getInstance().stsCredentials1()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss();
|
||||
// toAliYunOss(file, isHead);
|
||||
toUpdateOssNew(0);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -275,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) {
|
||||
@@ -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();
|
||||
@@ -2,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)
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 通用弹窗
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 通用弹窗
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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 {
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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 {
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 版本弹窗
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.event;
|
||||
package com.hbl.lewan.event;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.event;
|
||||
package com.hbl.lewan.event;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.game;
|
||||
package com.hbl.lewan.game;
|
||||
|
||||
import static androidx.activity.result.contract.ActivityResultContracts.*;
|
||||
|
||||
@@ -53,18 +53,18 @@ import com.bumptech.glide.Glide;
|
||||
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
|
||||
import com.codersun.fingerprintcompat.FingerManager;
|
||||
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.contact.UserInfoActivity;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
|
||||
import com.dskj.rbchat.dialog.PayCashDialog;
|
||||
import com.dskj.rbchat.dialog.PayCashFingerDialog;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.JsBridgeOrderBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.contact.UserInfoActivity;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog1;
|
||||
import com.hbl.lewan.dialog.PayCashDialog;
|
||||
import com.hbl.lewan.dialog.PayCashFingerDialog;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.main.authorize.AuthorizeActivity;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.JsBridgeOrderBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
import androidx.activity.result.contract.ActivityResultContracts;
|
||||
@@ -78,37 +78,37 @@ import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.amap.api.location.AMapLocation;
|
||||
import com.amap.api.location.AMapLocationClient;
|
||||
import com.amap.api.location.AMapLocationClientOption;
|
||||
import com.amap.api.location.AMapLocationListener;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityChangePaypasswordBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityJsbridgeBinding;
|
||||
import com.dskj.rbchat.dialog.PayDialog;
|
||||
import com.dskj.rbchat.model.AuthorizeBean;
|
||||
import com.dskj.rbchat.model.H5ChangeTitle;
|
||||
import com.dskj.rbchat.model.NewsBean;
|
||||
import com.dskj.rbchat.model.StaffServiceIdBean;
|
||||
import com.dskj.rbchat.model.TopUpBean;
|
||||
import com.dskj.rbchat.model.UserAlbumBean;
|
||||
import com.dskj.rbchat.model.UserShareBean;
|
||||
import com.dskj.rbchat.model.UsersExistBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.NfcReaderActivity;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.QRCodeScheme;
|
||||
import com.dskj.rbchat.utils.ShareDateUtils;
|
||||
import com.dskj.rbchat.utils.SoftHideKeyBoardUtil;
|
||||
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
|
||||
import com.dskj.rbchat.welcome.WelcomeActivity;
|
||||
import com.dskj.rbchat.widget.StatusLayout;
|
||||
//import com.amap.api.location.AMapLocation;
|
||||
//import com.amap.api.location.AMapLocationClient;
|
||||
//import com.amap.api.location.AMapLocationClientOption;
|
||||
//import com.amap.api.location.AMapLocationListener;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityChangePaypasswordBinding;
|
||||
import com.hbl.lewan.databinding.ActivityJsbridgeBinding;
|
||||
import com.hbl.lewan.dialog.PayDialog;
|
||||
import com.hbl.lewan.model.AuthorizeBean;
|
||||
import com.hbl.lewan.model.H5ChangeTitle;
|
||||
import com.hbl.lewan.model.NewsBean;
|
||||
import com.hbl.lewan.model.StaffServiceIdBean;
|
||||
import com.hbl.lewan.model.TopUpBean;
|
||||
import com.hbl.lewan.model.UserAlbumBean;
|
||||
import com.hbl.lewan.model.UserShareBean;
|
||||
import com.hbl.lewan.model.UsersExistBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.NfcReaderActivity;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.QRCodeScheme;
|
||||
import com.hbl.lewan.utils.ShareDateUtils;
|
||||
import com.hbl.lewan.utils.SoftHideKeyBoardUtil;
|
||||
import com.hbl.lewan.wallet.SetPayPasswordActivity;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.hbl.lewan.widget.StatusLayout;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.huawei.hms.hmsscankit.ScanUtil;
|
||||
import com.huawei.hms.hmsscankit.ScanUtilHtml;
|
||||
@@ -155,8 +155,8 @@ import com.netease.yunxin.kit.corekit.im.model.FriendInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
|
||||
import com.netease.yunxin.kit.corekit.im.provider.FetchCallbackImpl;
|
||||
import com.netease.yunxin.kit.locationkit.MapNavigator;
|
||||
import com.netease.yunxin.nertc.ui.CallKitUI;
|
||||
//import com.netease.yunxin.kit.locationkit.MapNavigator;
|
||||
//import com.netease.yunxin.nertc.ui.CallKitUI;
|
||||
import com.smallbuer.jsbridge.core.BridgeHandler;
|
||||
import com.smallbuer.jsbridge.core.BridgeWebView;
|
||||
import com.smallbuer.jsbridge.core.CallBackFunction;
|
||||
@@ -425,6 +425,8 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
viewBinding.jsbridgeBridgewebview.addHandlerLocal("ZeroCard", new BridgeHandler() {
|
||||
@Override
|
||||
public void handler(Context context, String s, CallBackFunction callBackFunction) {
|
||||
callBackFunction.onCallBack("");
|
||||
|
||||
try {
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setData(Uri.parse(s));
|
||||
@@ -715,8 +717,9 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
@Override
|
||||
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
|
||||
callBackFunctionLocation = callBackFunction;
|
||||
callBackFunctionLocation.onCallBack("");
|
||||
|
||||
initLocation();
|
||||
// initLocation();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -807,7 +810,7 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
LogUtils.d("googleNavigation");
|
||||
callBackFunction.onCallBack("");
|
||||
|
||||
MapNavigator.googleGuide(JsBridgeActivity.this, s);
|
||||
// MapNavigator.googleGuide(JsBridgeActivity.this, s);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1152,7 +1155,7 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
if (isStart) {
|
||||
tvTitle.setVisibility(View.VISIBLE);
|
||||
tvCancel.setVisibility(View.VISIBLE);
|
||||
tvStatus.setText(getString(com.dskj.rbchat.R.string.nfctitle_dialog_status));
|
||||
tvStatus.setText(getString(com.hbl.lewan.R.string.nfctitle_dialog_status));
|
||||
Glide.with(this).load(R.mipmap.nfc_read).into(ivStatus);
|
||||
tvCancel.setOnClickListener(view -> {
|
||||
nfcAdapter.disableReaderMode(this);
|
||||
@@ -1414,183 +1417,183 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
|
||||
}
|
||||
|
||||
AMapLocation aMapLocation;
|
||||
//声明AMapLocationClientOption对象
|
||||
public AMapLocationClientOption mLocationOption = null;
|
||||
//声明AMapLocationClient类对象
|
||||
public AMapLocationClient mLocationClient = null;
|
||||
//声明定位回调监听器
|
||||
public AMapLocationListener mLocationListener;
|
||||
// AMapLocation aMapLocation;
|
||||
// //声明AMapLocationClientOption对象
|
||||
// public AMapLocationClientOption mLocationOption = null;
|
||||
// //声明AMapLocationClient类对象
|
||||
// public AMapLocationClient mLocationClient = null;
|
||||
// //声明定位回调监听器
|
||||
// public AMapLocationListener mLocationListener;
|
||||
|
||||
private void initLocation() {
|
||||
if (aMapLocation == null) {
|
||||
showLoc();
|
||||
} else {
|
||||
toLocation();
|
||||
}
|
||||
}
|
||||
|
||||
private void showLoc() {
|
||||
int cameraPermission = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_COARSE_LOCATION);
|
||||
if (cameraPermission == PackageManager.PERMISSION_GRANTED) {
|
||||
int cameraPermission1 = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_FINE_LOCATION);
|
||||
if (cameraPermission1 == PackageManager.PERMISSION_GRANTED) {
|
||||
toLocation();
|
||||
} else {
|
||||
toShowNoPer();
|
||||
}
|
||||
// private void initLocation() {
|
||||
// if (aMapLocation == null) {
|
||||
// showLoc();
|
||||
// } else {
|
||||
// toLocation();
|
||||
// }
|
||||
// }
|
||||
|
||||
} else {
|
||||
toShowNoPer();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// private void showLoc() {
|
||||
// int cameraPermission = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_COARSE_LOCATION);
|
||||
// if (cameraPermission == PackageManager.PERMISSION_GRANTED) {
|
||||
// int cameraPermission1 = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_FINE_LOCATION);
|
||||
// if (cameraPermission1 == PackageManager.PERMISSION_GRANTED) {
|
||||
// toLocation();
|
||||
// } else {
|
||||
// toShowNoPer();
|
||||
// }
|
||||
//// toLocation();
|
||||
//
|
||||
// } else {
|
||||
// toShowNoPer();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
public PermissionExplainDialog permissionExplainDialog;
|
||||
|
||||
private void toShowNoPer() {
|
||||
String[] permissions = {
|
||||
Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION
|
||||
};
|
||||
permissionExplainDialog = new PermissionExplainDialog(JsBridgeActivity.this, getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_title), getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_content));
|
||||
permissionExplainDialog.show();
|
||||
Permission.requirePermissions(IMKitClient.getApplicationContext(), permissions)
|
||||
.request(
|
||||
new Permission.PermissionCallback() {
|
||||
@Override
|
||||
public void onGranted(List<String> permissionsGranted) {
|
||||
toLocation();
|
||||
permissionExplainDialog.dismiss();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDenial(
|
||||
List<String> permissionsDenial, List<String> permissionDenialForever) {
|
||||
permissionExplainDialog.dismiss();
|
||||
Map<String, Object> map1 = new HashMap<>();
|
||||
map1.put("code", 0);
|
||||
map1.put("error", "用户未授权");
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onException(Exception exception) {
|
||||
permissionExplainDialog.dismiss();
|
||||
Toast.makeText(JsBridgeActivity.this, com.netease.yunxin.kit.chatkit.ui.R.string.permission_default, Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
Map<String, Object> map1 = new HashMap<>();
|
||||
map1.put("code", 0);
|
||||
map1.put("error", "用户未授权");
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
}
|
||||
});
|
||||
}
|
||||
// private void toShowNoPer() {
|
||||
// String[] permissions = {
|
||||
// Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION
|
||||
// };
|
||||
// permissionExplainDialog = new PermissionExplainDialog(JsBridgeActivity.this, getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_title), getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_content));
|
||||
// permissionExplainDialog.show();
|
||||
// Permission.requirePermissions(IMKitClient.getApplicationContext(), permissions)
|
||||
// .request(
|
||||
// new Permission.PermissionCallback() {
|
||||
// @Override
|
||||
// public void onGranted(List<String> permissionsGranted) {
|
||||
// toLocation();
|
||||
// permissionExplainDialog.dismiss();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onDenial(
|
||||
// List<String> permissionsDenial, List<String> permissionDenialForever) {
|
||||
// permissionExplainDialog.dismiss();
|
||||
// Map<String, Object> map1 = new HashMap<>();
|
||||
// map1.put("code", 0);
|
||||
// map1.put("error", "用户未授权");
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onException(Exception exception) {
|
||||
// permissionExplainDialog.dismiss();
|
||||
// Toast.makeText(JsBridgeActivity.this, com.netease.yunxin.kit.chatkit.ui.R.string.permission_default, Toast.LENGTH_SHORT)
|
||||
// .show();
|
||||
// Map<String, Object> map1 = new HashMap<>();
|
||||
// map1.put("code", 0);
|
||||
// map1.put("error", "用户未授权");
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
|
||||
private void toLocation() {
|
||||
//设置定位回调监听
|
||||
mLocationListener = amapLocation -> {
|
||||
if (amapLocation != null) {
|
||||
if (amapLocation.getErrorCode() == 0) {
|
||||
if (aMapLocation == null) {
|
||||
aMapLocation = amapLocation;
|
||||
}
|
||||
//可在其中解析amapLocation获取相应内容。
|
||||
LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
|
||||
+ amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";" + amapLocation.getProvince());
|
||||
|
||||
toInfo(amapLocation);
|
||||
|
||||
} else {
|
||||
//定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
|
||||
Map<String, Object> map1 = new HashMap<>();
|
||||
map1.put("code", 0);
|
||||
map1.put("error", "定位失败");
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
|
||||
}
|
||||
} else {
|
||||
Map<String, Object> map1 = new HashMap<>();
|
||||
map1.put("code", 0);
|
||||
map1.put("error", "定位数据为空");
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
//初始化AMapLocationClientOption对象
|
||||
mLocationOption = new AMapLocationClientOption();
|
||||
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
|
||||
mLocationOption.setOnceLocation(true);
|
||||
mLocationOption.setOnceLocationLatest(true);
|
||||
mLocationOption.setHttpTimeOut(20000);
|
||||
mLocationOption.setLocationCacheEnable(false);
|
||||
|
||||
//初始化定位
|
||||
try {
|
||||
mLocationClient = new AMapLocationClient(JsBridgeActivity.this);
|
||||
mLocationClient.setLocationOption(mLocationOption);
|
||||
mLocationClient.setLocationListener(mLocationListener);
|
||||
mLocationClient.startLocation();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// mLocationListener = amapLocation -> {
|
||||
// if (amapLocation != null) {
|
||||
// if (amapLocation.getErrorCode() == 0) {
|
||||
// if (aMapLocation == null) {
|
||||
// aMapLocation = amapLocation;
|
||||
// }
|
||||
// //可在其中解析amapLocation获取相应内容。
|
||||
// LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
|
||||
// + amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";" + amapLocation.getProvince());
|
||||
//
|
||||
// toInfo(amapLocation);
|
||||
//
|
||||
// } else {
|
||||
// //定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
|
||||
// Map<String, Object> map1 = new HashMap<>();
|
||||
// map1.put("code", 0);
|
||||
// map1.put("error", "定位失败");
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
//
|
||||
// }
|
||||
// } else {
|
||||
// Map<String, Object> map1 = new HashMap<>();
|
||||
// map1.put("code", 0);
|
||||
// map1.put("error", "定位数据为空");
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
|
||||
//
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// //初始化AMapLocationClientOption对象
|
||||
// mLocationOption = new AMapLocationClientOption();
|
||||
// mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
|
||||
// mLocationOption.setOnceLocation(true);
|
||||
// mLocationOption.setOnceLocationLatest(true);
|
||||
// mLocationOption.setHttpTimeOut(20000);
|
||||
// mLocationOption.setLocationCacheEnable(false);
|
||||
//
|
||||
// //初始化定位
|
||||
// try {
|
||||
// mLocationClient = new AMapLocationClient(JsBridgeActivity.this);
|
||||
// mLocationClient.setLocationOption(mLocationOption);
|
||||
// mLocationClient.setLocationListener(mLocationListener);
|
||||
// mLocationClient.startLocation();
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void toInfo(AMapLocation amapLocation) {
|
||||
|
||||
|
||||
List<Address> addresses;
|
||||
|
||||
Geocoder geocoder = new Geocoder(JsBridgeActivity.this, Locale.TAIWAN);
|
||||
String addStr = null;
|
||||
try {
|
||||
addresses = geocoder.getFromLocation(amapLocation.getLatitude(), amapLocation.getLongitude(), 1);
|
||||
LogUtils.i("选择地址11111111111");
|
||||
|
||||
String address = addresses.get(0).getAddressLine(0);
|
||||
String city = addresses.get(0).getLocality();
|
||||
String state = addresses.get(0).getAdminArea();
|
||||
String zipCode = addresses.get(0).getPostalCode();
|
||||
String country = addresses.get(0).getCountryCode();
|
||||
addStr = address + "," + city + "," + state + "," + zipCode + "," + country;
|
||||
LogUtils.i("选择地址222222222222");
|
||||
|
||||
LogUtils.i("选择地址" + addStr);
|
||||
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
maps.put("code", 1);
|
||||
maps.put("longitude", amapLocation.getLongitude());
|
||||
maps.put("latitude", amapLocation.getLatitude());
|
||||
maps.put("address", address);
|
||||
maps.put("country", country);
|
||||
maps.put("province", state);
|
||||
maps.put("city", city);
|
||||
LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
LogUtils.i("选择地址333333333");
|
||||
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
maps.put("code", 1);
|
||||
maps.put("longitude", amapLocation.getLongitude());
|
||||
maps.put("latitude", amapLocation.getLatitude());
|
||||
maps.put("address", amapLocation.getAddress());
|
||||
maps.put("country", amapLocation.getCountry());
|
||||
maps.put("province", amapLocation.getProvince());
|
||||
maps.put("city", amapLocation.getCity());
|
||||
LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
|
||||
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// private void toInfo(AMapLocation amapLocation) {
|
||||
//
|
||||
//
|
||||
// List<Address> addresses;
|
||||
//
|
||||
// Geocoder geocoder = new Geocoder(JsBridgeActivity.this, Locale.TAIWAN);
|
||||
// String addStr = null;
|
||||
// try {
|
||||
// addresses = geocoder.getFromLocation(amapLocation.getLatitude(), amapLocation.getLongitude(), 1);
|
||||
// LogUtils.i("选择地址11111111111");
|
||||
//
|
||||
// String address = addresses.get(0).getAddressLine(0);
|
||||
// String city = addresses.get(0).getLocality();
|
||||
// String state = addresses.get(0).getAdminArea();
|
||||
// String zipCode = addresses.get(0).getPostalCode();
|
||||
// String country = addresses.get(0).getCountryCode();
|
||||
// addStr = address + "," + city + "," + state + "," + zipCode + "," + country;
|
||||
// LogUtils.i("选择地址222222222222");
|
||||
//
|
||||
// LogUtils.i("选择地址" + addStr);
|
||||
//
|
||||
// Map<String, Object> maps = new HashMap<>();
|
||||
// maps.put("code", 1);
|
||||
// maps.put("longitude", amapLocation.getLongitude());
|
||||
// maps.put("latitude", amapLocation.getLatitude());
|
||||
// maps.put("address", address);
|
||||
// maps.put("country", country);
|
||||
// maps.put("province", state);
|
||||
// maps.put("city", city);
|
||||
// LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
|
||||
// } catch (IOException e) {
|
||||
// e.printStackTrace();
|
||||
// LogUtils.i("选择地址333333333");
|
||||
//
|
||||
// Map<String, Object> maps = new HashMap<>();
|
||||
// maps.put("code", 1);
|
||||
// maps.put("longitude", amapLocation.getLongitude());
|
||||
// maps.put("latitude", amapLocation.getLatitude());
|
||||
// maps.put("address", amapLocation.getAddress());
|
||||
// maps.put("country", amapLocation.getCountry());
|
||||
// maps.put("province", amapLocation.getProvince());
|
||||
// maps.put("city", amapLocation.getCity());
|
||||
// LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
|
||||
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
@@ -1639,18 +1642,18 @@ public class JsBridgeActivity extends BaseActivity {
|
||||
String result1 = ((HmsScan) obj).getOriginalValue();
|
||||
// LogUtils.i("回调数据："+result1);
|
||||
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(result1);
|
||||
// 2维码内容前缀（形如“time_go_chat://add_user/”）
|
||||
// 2维码内容前缀（形如“time_go_mm://add_user/”）
|
||||
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
|
||||
|
||||
//{"scheme":"time_go_chat://payment_bead/","userId":"10","value":"388a762b474f944b"}
|
||||
//{"scheme":"time_go_mm://payment_bead/","userId":"10","value":"388a762b474f944b"}
|
||||
String scheme = qrData.getScheme();
|
||||
if (scheme.startsWith("http")) {
|
||||
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
|
||||
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
|
||||
sendMachine(scheme);
|
||||
}
|
||||
}
|
||||
|
||||
if (scheme.equals("time_go_chat://payment_bead/")) {
|
||||
if (scheme.equals("time_go_mm://payment_bead/")) {
|
||||
if (bindBean != null) {
|
||||
if (!bindBean.getPhoneBind()) {
|
||||
showDialog();
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -2,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 -> {
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -0,0 +1,145 @@
|
||||
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.hbl.lewan.imkit.team;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.blankj.utilcode.util.ToastUtils;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.ActivityTeamMembersJinyanBinding;
|
||||
import com.hbl.lewan.model.LikeBean;
|
||||
import com.hbl.lewan.model.TeamUpdateEvent;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.friend.FriendService;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
|
||||
import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
|
||||
import com.netease.yunxin.kit.corekit.event.EventCenter;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
|
||||
import com.netease.yunxin.kit.corekit.route.XKitRouter;
|
||||
import com.netease.yunxin.kit.teamkit.ui.utils.viewmodel.TeamSettingViewModel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 群聊成员页面 (编辑群员，群主转让那) 这快逻辑有点乱
|
||||
*/
|
||||
public class TeamMembersJinYanActivity extends BaseActivity {
|
||||
|
||||
public final TeamSettingViewModel teammodel = new TeamSettingViewModel();
|
||||
public List<UserInfoWithTeam> listmemebers = new ArrayList<>();
|
||||
CommonAdapter commonAdapter;
|
||||
ActivityTeamMembersJinyanBinding binding;
|
||||
String teamId;
|
||||
int manages = 0;
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
binding = ActivityTeamMembersJinyanBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
binding.title.setTitle(getString(R.string.yijinyanchengyuan_txt));
|
||||
teamId = getIntent().getStringExtra("teamId");
|
||||
initListAdapter();
|
||||
teammodel.requestTeamMembers(teamId);
|
||||
teammodel.getUserInfoData().observe(this, listResultInfo -> {
|
||||
if (listResultInfo.getSuccess()) {
|
||||
List<UserInfoWithTeam> list = listResultInfo.getValue();
|
||||
LogUtils.i("结果是啥："+GsonUtils.beanToJSONString(list));
|
||||
listmemebers.clear();
|
||||
for (UserInfoWithTeam userInfoWithTeam:list){
|
||||
if(userInfoWithTeam.getUserInfo().getAccount().equals(IMKitClient.account())){
|
||||
manages = userInfoWithTeam.getTeamInfo().getType().getValue();
|
||||
}
|
||||
if(userInfoWithTeam.getTeamInfo().isMute()){
|
||||
listmemebers.add(userInfoWithTeam);
|
||||
}
|
||||
}
|
||||
LogUtils.i("结果是啥1："+GsonUtils.beanToJSONString(listmemebers));
|
||||
|
||||
commonAdapter.setDates(listmemebers);
|
||||
}
|
||||
});
|
||||
binding.title.getBackImageView().setOnClickListener(view -> finish());
|
||||
}
|
||||
|
||||
private void initListAdapter() {
|
||||
|
||||
binding.rvMembers.setLayoutManager( new LinearLayoutManager(TeamMembersJinYanActivity.this));
|
||||
commonAdapter = new CommonAdapter<UserInfoWithTeam>(TeamMembersJinYanActivity.this, R.layout.team_members_view_holder1, listmemebers) {
|
||||
@Override
|
||||
public void convert(ViewHolder holder, UserInfoWithTeam s, int index) {
|
||||
ContactAvatarView contactAvatarView = holder.getView(R.id.avatar_view);
|
||||
TextView tvName = holder.getView(R.id.tv_name);
|
||||
View line = holder.getView(R.id.item_line);
|
||||
String name = s.getUserInfo().getName();
|
||||
if (ContactRepo.isFriend(s.getUserInfo().getAccount())) {
|
||||
String alias = ContactRepo.getFriend(s.getUserInfo().getAccount()).getAlias();
|
||||
if (!TextUtils.isEmpty(alias)) {
|
||||
name = alias;
|
||||
}
|
||||
}
|
||||
tvName.setText(name);
|
||||
if (TextUtils.isEmpty(s.getUserInfo().getAvatar())) {
|
||||
contactAvatarView.setData(R.mipmap.default_head_img, s.getUserInfo().getName(), 0);
|
||||
} else {
|
||||
contactAvatarView.setData(s.getUserInfo().getAvatar(), s.getUserInfo().getName());
|
||||
}
|
||||
contactAvatarView.setOnClickListener(v -> {
|
||||
startUserInfoActivity(s.getUserInfo().getAccount());
|
||||
});
|
||||
line.setVisibility(View.VISIBLE);
|
||||
if (index == listmemebers.size()-1) {
|
||||
line.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
|
||||
holder.getView(R.id.jinyan_iv).setOnClickListener(v -> {
|
||||
// showDeleteDialog(index, user.getName(), user.getAccount());
|
||||
if(manages ==1||(manages==2&&s.getTeamInfo().getType().getValue()==0)){
|
||||
TeamService v2TeamService = NIMClient.getService(TeamService.class);
|
||||
v2TeamService.muteTeamMember(teamId, s.getUserInfo().getAccount(),false);
|
||||
listmemebers.remove(index);
|
||||
notifyDataSetChanged();
|
||||
}else{
|
||||
ToastUtils.showShort(getString(com.netease.yunxin.kit.chatkit.ui.R.string.chat_no_permission));
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
};
|
||||
binding.rvMembers.setAdapter(commonAdapter);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void startUserInfoActivity(String userid) {
|
||||
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
|
||||
.withContext(TeamMembersJinYanActivity.this)
|
||||
.withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
|
||||
.withParam("userId", userid)
|
||||
.withParam("isGroup", true)
|
||||
.navigate();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.imkit.team;
|
||||
package com.hbl.lewan.imkit.team;
|
||||
|
||||
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
|
||||
|
||||
@@ -24,15 +24,15 @@ import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityTeamMembersBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.imkit.team.adapter.TeamMembersAdapter;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityTeamMembersBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.RequestCallback;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
@@ -131,6 +131,8 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
|
||||
isAllowAdd = extensionBean.getAllowAddFriends();
|
||||
}
|
||||
if (list != null && list.size() > 0) {
|
||||
LogUtils.i("走了333333333377777777777777：");
|
||||
|
||||
listmemebers.clear();
|
||||
listmemebers.addAll(list);
|
||||
getTeamActiveTime();
|
||||
@@ -146,7 +148,11 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
|
||||
listmemebers.clear();
|
||||
listmember = sortListMembers(listmember);
|
||||
for (UserInfoWithTeam userinfo : listmember) {
|
||||
listmemebers.add(userinfo.getUserInfo());
|
||||
LogUtils.i("走了333333333355555555555："+GsonUtils.beanToJSONString(userinfo));
|
||||
|
||||
UserInfo userInfos = userinfo.getUserInfo();
|
||||
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
|
||||
listmemebers.add(userInfos);
|
||||
}
|
||||
setData();
|
||||
|
||||
@@ -195,6 +201,8 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
|
||||
@Override
|
||||
public void onSuccess(Result<Map<String, Long>> feedbackResp) {
|
||||
LogUtils.d("dddd" + feedbackResp.data);
|
||||
LogUtils.i("走了333333333366666666：");
|
||||
|
||||
memberMap = feedbackResp.data;
|
||||
listmemebers.remove(0);
|
||||
listmemebers = sortListByActivieTime(listmemebers);
|
||||
@@ -341,6 +349,19 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
|
||||
}
|
||||
|
||||
public void startUserInfoActivity(String userid, String teamId) {
|
||||
|
||||
if(isManager==1||isManager==2){
|
||||
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
|
||||
.withContext(TeamMembersListActivity.this)
|
||||
.withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
|
||||
.withParam("userId", userid)
|
||||
.withParam("teamId", teamId)
|
||||
.withParam("isGroup", true)
|
||||
.navigate();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//如果群不允许群内添加好友 当前登录用户不是群主，以及userid 也不是群主 直接跳过
|
||||
if (isAllowAdd == 0 && isManager != 1 && !userid.equals(teamOwnerId)) {
|
||||
|
||||
@@ -454,8 +475,14 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
|
||||
listmemebers.clear();
|
||||
listmemebers.add(IMKitClient.getUserInfo());
|
||||
for (UserInfoWithTeam userinfo : list) {
|
||||
LogUtils.i("走了3333333333444444444："+GsonUtils.beanToJSONString(userinfo));
|
||||
|
||||
selectorlist.add(userinfo.getUserInfo().getAccount());
|
||||
listmemebers.add(userinfo.getUserInfo());
|
||||
UserInfo userInfos = userinfo.getUserInfo();
|
||||
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
|
||||
listmemebers.add(userInfos);
|
||||
|
||||
// listmemebers.add(userinfo.getUserInfo());
|
||||
}
|
||||
membersAdapter.setData(listmemebers, true, memberMap, teamId);
|
||||
isRefresh = true;
|
||||
@@ -2,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());
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -2,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() {
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.imkit.team.adapter;
|
||||
package com.hbl.lewan.imkit.team.adapter;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
@@ -17,8 +17,8 @@ import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.viewbinding.ViewBinding;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.TeamMembersViewHolderBinding;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.TeamMembersViewHolderBinding;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
|
||||
@@ -192,6 +192,11 @@ public class TeamMembersAdapter extends RecyclerView.Adapter<TeamMembersAdapter.
|
||||
} else {
|
||||
holder.binding.tvNameActivetime.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
holder.binding.jinyanIv.setVisibility(View.GONE);
|
||||
if(!TextUtils.isEmpty(userInfo.getSignature())&&userInfo.getSignature().equals("1")){
|
||||
holder.binding.jinyanIv.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
holder.binding.getRoot().setOnClickListener(view -> {
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.jpush;
|
||||
package com.hbl.lewan.jpush;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -12,7 +12,7 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Set;
|
||||
|
||||
import cn.jpush.android.helper.Logger;
|
||||
//import cn.jpush.android.helper.Logger;
|
||||
|
||||
public final class LocalBroadcastManager {
|
||||
private static final String TAG = "JIGUANG-Example";
|
||||
@@ -119,13 +119,13 @@ public final class LocalBroadcastManager {
|
||||
Set categories = intent.getCategories();
|
||||
boolean debug = (intent.getFlags() & 8) != 0;
|
||||
if (debug) {
|
||||
Logger.v("LocalBroadcastManager", "Resolving type " + type + " scheme " + scheme + " of intent " + intent);
|
||||
// Logger.v("LocalBroadcastManager", "Resolving type " + type + " scheme " + scheme + " of intent " + intent);
|
||||
}
|
||||
|
||||
ArrayList entries = (ArrayList) this.mActions.get(intent.getAction());
|
||||
if (entries != null) {
|
||||
if (debug) {
|
||||
Logger.v("LocalBroadcastManager", "Action list: " + entries);
|
||||
// Logger.v("LocalBroadcastManager", "Action list: " + entries);
|
||||
}
|
||||
|
||||
ArrayList receivers = null;
|
||||
@@ -134,18 +134,18 @@ public final class LocalBroadcastManager {
|
||||
for (i = 0; i < entries.size(); ++i) {
|
||||
ReceiverRecord receiver = (ReceiverRecord) entries.get(i);
|
||||
if (debug) {
|
||||
Logger.v("LocalBroadcastManager", "Matching against filter " + receiver.filter);
|
||||
// Logger.v("LocalBroadcastManager", "Matching against filter " + receiver.filter);
|
||||
}
|
||||
|
||||
if (receiver.broadcasting) {
|
||||
if (debug) {
|
||||
Logger.v("LocalBroadcastManager", " Filter\'s target already added");
|
||||
// Logger.v("LocalBroadcastManager", " Filter\'s target already added");
|
||||
}
|
||||
} else {
|
||||
int match = receiver.filter.match(action, type, scheme, data, categories, "LocalBroadcastManager");
|
||||
if (match >= 0) {
|
||||
if (debug) {
|
||||
Logger.v("LocalBroadcastManager", " Filter matched! match=0x" + Integer.toHexString(match));
|
||||
// Logger.v("LocalBroadcastManager", " Filter matched! match=0x" + Integer.toHexString(match));
|
||||
}
|
||||
|
||||
if (receivers == null) {
|
||||
@@ -173,7 +173,7 @@ public final class LocalBroadcastManager {
|
||||
reason = "unknown reason";
|
||||
}
|
||||
|
||||
Logger.v("LocalBroadcastManager", " Filter did not match: " + reason);
|
||||
// Logger.v("LocalBroadcastManager", " Filter did not match: " + reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
187
app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java
Normal file
187
app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java
Normal file
@@ -0,0 +1,187 @@
|
||||
//package com.hbl.lewan.jpush;
|
||||
//
|
||||
//import android.content.Context;
|
||||
//import android.content.Intent;
|
||||
//import android.os.Bundle;
|
||||
//import android.text.TextUtils;
|
||||
//import android.util.Log;
|
||||
//
|
||||
//import com.hbl.lewan.main.MainActivity;
|
||||
//import com.hbl.lewan.main.message.NotifyActMessageActivity;
|
||||
//import com.hbl.lewan.main.message.NotifyMessageDetailsActivity;
|
||||
//import com.hbl.lewan.model.NotifyExtraBean;
|
||||
//import com.hbl.lewan.utils.GsonUtils;
|
||||
//import com.hbl.lewan.utils.play.VoiceUtils;
|
||||
//import com.hbl.lewan.voom.MessageActivity;
|
||||
//import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
//import com.google.gson.JsonObject;
|
||||
//
|
||||
//import cn.jpush.android.api.CmdMessage;
|
||||
//import cn.jpush.android.api.CustomMessage;
|
||||
//import cn.jpush.android.api.JPushInterface;
|
||||
//import cn.jpush.android.api.JPushMessage;
|
||||
//import cn.jpush.android.api.NotificationMessage;
|
||||
//import cn.jpush.android.service.JPushMessageReceiver;
|
||||
//
|
||||
//public class PushMessageReceiver extends JPushMessageReceiver {
|
||||
// private static final String TAG = "PushMessageReceiver";
|
||||
// public static final String MESSAGE_RECEIVED_ACTION = "com.example.jpushdemo.MESSAGE_RECEIVED_ACTION";
|
||||
// public static final String KEY_MESSAGE = "message";
|
||||
// public static final String KEY_EXTRAS = "extras";
|
||||
//
|
||||
// @Override
|
||||
// public void onMessage(Context context, CustomMessage customMessage) {
|
||||
// Log.e(TAG, "[onMessage] " + customMessage);
|
||||
// processCustomMessage(context, customMessage);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onNotifyMessageOpened(Context context, NotificationMessage message) {
|
||||
// Log.e(TAG, "[onNotifyMessageOpened] " + message);
|
||||
// try {
|
||||
// //打开自定义的Activity
|
||||
// if (!TextUtils.isEmpty(message.notificationExtras)) {
|
||||
// NotifyExtraBean bean = GsonUtils.getObjFromJSON(message.notificationExtras, NotifyExtraBean.class);
|
||||
// if (bean != null && (bean.getType() == 40 || bean.getType() == 41)) {
|
||||
// Intent i = new Intent(context, NotifyMessageDetailsActivity.class);
|
||||
// i.putExtra("id", bean.getPostId());
|
||||
// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
// context.startActivity(i);
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// Intent i = new Intent(context, MainActivity.class);
|
||||
//// Bundle bundle = new Bundle();
|
||||
//// bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE,message.notificationTitle);
|
||||
//// bundle.putString(JPushInterface.EXTRA_ALERT,message.notificationContent);
|
||||
//// i.putExtras(bundle);
|
||||
// //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
// context.startActivity(i);
|
||||
// } catch (Throwable throwable) {
|
||||
// throwable.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onMultiActionClicked(Context context, Intent intent) {
|
||||
// Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
|
||||
// String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
|
||||
//
|
||||
// //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
|
||||
// if (nActionExtra == null) {
|
||||
// Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
|
||||
// return;
|
||||
// }
|
||||
// if (nActionExtra.equals("my_extra1")) {
|
||||
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
|
||||
// } else if (nActionExtra.equals("my_extra2")) {
|
||||
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
|
||||
// } else if (nActionExtra.equals("my_extra3")) {
|
||||
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
|
||||
// } else {
|
||||
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onNotifyMessageArrived(Context context, NotificationMessage message) {
|
||||
// Log.e(TAG, "[onNotifyMessageArrived] " + message + " json==" + message.notificationTargetEvent);
|
||||
// String extra = message.notificationExtras;
|
||||
// if (!TextUtils.isEmpty(extra)) {
|
||||
// NotifyExtraBean bean = GsonUtils.getObjFromJSON(extra, NotifyExtraBean.class);
|
||||
// if (bean != null) {
|
||||
// switch (bean.getType()) {
|
||||
// case 30:
|
||||
// case 34: //cash
|
||||
// VoiceUtils.with(context).Play(bean.getPostId(), 0);
|
||||
// break;
|
||||
// case 35: //礼品积分
|
||||
// VoiceUtils.with(context).Play(bean.getPostId(), 1);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
|
||||
// Log.e(TAG, "[onNotifyMessageDismiss] " + message);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onRegister(Context context, String registrationId) {
|
||||
// Log.e(TAG, "[onRegister] " + registrationId);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onConnected(Context context, boolean isConnected) {
|
||||
// Log.e(TAG, "[onConnected] " + isConnected);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onCommandResult(Context context, CmdMessage cmdMessage) {
|
||||
// Log.e(TAG, "[onCommandResult] " + cmdMessage);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// TagAliasOperatorHelper.getInstance().onTagOperatorResult(context, jPushMessage);
|
||||
// super.onTagOperatorResult(context, jPushMessage);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context, jPushMessage);
|
||||
// super.onCheckTagOperatorResult(context, jPushMessage);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context, jPushMessage);
|
||||
// super.onAliasOperatorResult(context, jPushMessage);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context, jPushMessage);
|
||||
// super.onMobileNumberOperatorResult(context, jPushMessage);
|
||||
// }
|
||||
//
|
||||
// //send msg to MainActivity
|
||||
// private void processCustomMessage(Context context, CustomMessage customMessage) {
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// /*if (MainActivity.isForeground) {
|
||||
// String message = customMessage.message;
|
||||
// String extras = customMessage.extra;
|
||||
// Intent msgIntent = new Intent(MESSAGE_RECEIVED_ACTION);
|
||||
// msgIntent.putExtra(KEY_MESSAGE, message);
|
||||
// if (!Utils.isEmpty(extras)) {
|
||||
// try {
|
||||
// JSONObject extraJson = new JSONObject(extras);
|
||||
// if (extraJson.length() > 0) {
|
||||
// msgIntent.putExtra(KEY_EXTRAS, extras);
|
||||
// }
|
||||
// } catch (JSONException e) {
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
|
||||
// }*/
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
|
||||
// super.onNotificationSettingsCheck(context, isOn, source);
|
||||
// Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// public void playSound() {
|
||||
//
|
||||
// }
|
||||
//}
|
||||
@@ -0,0 +1,339 @@
|
||||
//package com.hbl.lewan.jpush;
|
||||
//
|
||||
//import android.content.Context;
|
||||
//import android.os.Handler;
|
||||
//import android.os.Message;
|
||||
//import android.util.SparseArray;
|
||||
//
|
||||
//import java.util.Locale;
|
||||
//import java.util.Set;
|
||||
////
|
||||
////import cn.jpush.android.api.JPushInterface;
|
||||
////import cn.jpush.android.api.JPushMessage;
|
||||
////import cn.jpush.android.helper.Logger;
|
||||
//
|
||||
///**
|
||||
// * 处理tagalias相关的逻辑
|
||||
// * */
|
||||
//public class TagAliasOperatorHelper {
|
||||
// private static final String TAG = "JIGUANG-TagAliasHelper";
|
||||
// public static int sequence = 1;
|
||||
// /**增加*/
|
||||
// public static final int ACTION_ADD = 1;
|
||||
// /**覆盖*/
|
||||
// public static final int ACTION_SET = 2;
|
||||
// /**删除部分*/
|
||||
// public static final int ACTION_DELETE = 3;
|
||||
// /**删除所有*/
|
||||
// public static final int ACTION_CLEAN = 4;
|
||||
// /**查询*/
|
||||
// public static final int ACTION_GET = 5;
|
||||
//
|
||||
// public static final int ACTION_CHECK = 6;
|
||||
//
|
||||
// public static final int DELAY_SEND_ACTION = 1;
|
||||
//
|
||||
// public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
|
||||
//
|
||||
// private Context context;
|
||||
//
|
||||
// private static TagAliasOperatorHelper mInstance;
|
||||
// private TagAliasOperatorHelper(){
|
||||
// }
|
||||
// public static TagAliasOperatorHelper getInstance(){
|
||||
// if(mInstance == null){
|
||||
// synchronized (TagAliasOperatorHelper.class){
|
||||
// if(mInstance == null){
|
||||
// mInstance = new TagAliasOperatorHelper();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return mInstance;
|
||||
// }
|
||||
// public void init(Context context){
|
||||
// if(context != null) {
|
||||
// this.context = context.getApplicationContext();
|
||||
// }
|
||||
// }
|
||||
// private SparseArray<Object> setActionCache = new SparseArray<Object>();
|
||||
//
|
||||
// public Object get(int sequence){
|
||||
// return setActionCache.get(sequence);
|
||||
// }
|
||||
// public Object remove(int sequence){
|
||||
// return setActionCache.get(sequence);
|
||||
// }
|
||||
// public void put(int sequence,Object tagAliasBean){
|
||||
// setActionCache.put(sequence,tagAliasBean);
|
||||
// }
|
||||
// private Handler delaySendHandler = new Handler(){
|
||||
// @Override
|
||||
// public void handleMessage(Message msg) {
|
||||
// switch (msg.what){
|
||||
// case DELAY_SEND_ACTION:
|
||||
// if(msg.obj !=null && msg.obj instanceof TagAliasBean){
|
||||
// //Logger.i(TAG,"on delay time");
|
||||
// sequence++;
|
||||
// TagAliasBean tagAliasBean = (TagAliasBean) msg.obj;
|
||||
// setActionCache.put(sequence, tagAliasBean);
|
||||
// if(context!=null) {
|
||||
// handleAction(context, sequence, tagAliasBean);
|
||||
// }else{
|
||||
// //Logger.e(TAG,"#unexcepted - context was null");
|
||||
// }
|
||||
// }else{
|
||||
// //Logger.w(TAG,"#unexcepted - msg obj was incorrect");
|
||||
// }
|
||||
// break;
|
||||
// case DELAY_SET_MOBILE_NUMBER_ACTION:
|
||||
// if(msg.obj !=null && msg.obj instanceof String) {
|
||||
// //Logger.i(TAG, "retry set mobile number");
|
||||
// sequence++;
|
||||
// String mobileNumber = (String) msg.obj;
|
||||
// setActionCache.put(sequence, mobileNumber);
|
||||
// if(context !=null) {
|
||||
// handleAction(context, sequence, mobileNumber);
|
||||
// }else {
|
||||
// //Logger.e(TAG, "#unexcepted - context was null");
|
||||
// }
|
||||
// }else{
|
||||
// //Logger.w(TAG,"#unexcepted - msg obj was incorrect");
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
// public void handleAction(Context context,int sequence,String mobileNumber){
|
||||
// put(sequence,mobileNumber);
|
||||
// //Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
|
||||
//// JPushInterface.setMobileNumber(context,sequence,mobileNumber);
|
||||
// }
|
||||
// /**
|
||||
// * 处理设置tag
|
||||
// * */
|
||||
// public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
|
||||
// init(context);
|
||||
// if(tagAliasBean == null){
|
||||
// //Logger.w(TAG,"tagAliasBean was null");
|
||||
// return;
|
||||
// }
|
||||
// put(sequence,tagAliasBean);
|
||||
// if(tagAliasBean.isAliasAction){
|
||||
// switch (tagAliasBean.action){
|
||||
// case ACTION_GET:
|
||||
//// JPushInterface.getAlias(context,sequence);
|
||||
// break;
|
||||
// case ACTION_DELETE:
|
||||
//// JPushInterface.deleteAlias(context,sequence);
|
||||
// break;
|
||||
// case ACTION_SET:
|
||||
//// JPushInterface.setAlias(context,sequence,tagAliasBean.alias);
|
||||
// break;
|
||||
// default:
|
||||
// //Logger.w(TAG,"unsupport alias action type");
|
||||
// return;
|
||||
// }
|
||||
// }else {
|
||||
// switch (tagAliasBean.action) {
|
||||
// case ACTION_ADD:
|
||||
//// JPushInterface.addTags(context, sequence, tagAliasBean.tags);
|
||||
// break;
|
||||
// case ACTION_SET:
|
||||
//// JPushInterface.setTags(context, sequence, tagAliasBean.tags);
|
||||
// break;
|
||||
// case ACTION_DELETE:
|
||||
//// JPushInterface.deleteTags(context, sequence, tagAliasBean.tags);
|
||||
// break;
|
||||
// case ACTION_CHECK:
|
||||
// //一次只能check一个tag
|
||||
// String tag = (String)tagAliasBean.tags.toArray()[0];
|
||||
//// JPushInterface.checkTagBindState(context,sequence,tag);
|
||||
// break;
|
||||
// case ACTION_GET:
|
||||
//// JPushInterface.getAllTags(context, sequence);
|
||||
// break;
|
||||
// case ACTION_CLEAN:
|
||||
//// JPushInterface.cleanTags(context, sequence);
|
||||
// break;
|
||||
// default:
|
||||
// //Logger.w(TAG,"unsupport tag action type");
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// private boolean RetryActionIfNeeded(int errorCode,TagAliasBean tagAliasBean){
|
||||
// if(!Utils.isConnected(context)){
|
||||
// //Logger.w(TAG,"no network");
|
||||
// return false;
|
||||
// }
|
||||
// //返回的错误码为6002 超时,6014 服务器繁忙,都建议延迟重试
|
||||
// if(errorCode == 6002 || errorCode == 6014){
|
||||
// //Logger.d(TAG,"need retry");
|
||||
// if(tagAliasBean!=null){
|
||||
// Message message = new Message();
|
||||
// message.what = DELAY_SEND_ACTION;
|
||||
// message.obj = tagAliasBean;
|
||||
// delaySendHandler.sendMessageDelayed(message,1000*60);
|
||||
// String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
|
||||
// Utils.showToast(logs, context);
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
// private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
|
||||
// if(!Utils.isConnected(context)){
|
||||
// //Logger.w(TAG,"no network");
|
||||
// return false;
|
||||
// }
|
||||
// //返回的错误码为6002 超时,6024 服务器内部错误,建议稍后重试
|
||||
// if(errorCode == 6002 || errorCode == 6024){
|
||||
// //Logger.d(TAG,"need retry");
|
||||
// Message message = new Message();
|
||||
// message.what = DELAY_SET_MOBILE_NUMBER_ACTION;
|
||||
// message.obj = mobileNumber;
|
||||
// delaySendHandler.sendMessageDelayed(message,1000*60);
|
||||
// String str = "Failed to set mobile number due to %s. Try again after 60s.";
|
||||
// str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
|
||||
// Utils.showToast(str, context);
|
||||
// return true;
|
||||
// }
|
||||
// return false;
|
||||
//
|
||||
// }
|
||||
// private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
|
||||
// String str = "Failed to %s %s due to %s. Try again after 60s.";
|
||||
// str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
|
||||
// return str;
|
||||
// }
|
||||
//
|
||||
// private String getActionStr(int actionType){
|
||||
// switch (actionType){
|
||||
// case ACTION_ADD:
|
||||
// return "add";
|
||||
// case ACTION_SET:
|
||||
// return "set";
|
||||
// case ACTION_DELETE:
|
||||
// return "delete";
|
||||
// case ACTION_GET:
|
||||
// return "get";
|
||||
// case ACTION_CLEAN:
|
||||
// return "clean";
|
||||
// case ACTION_CHECK:
|
||||
// return "check";
|
||||
// }
|
||||
// return "unkonw operation";
|
||||
// }
|
||||
// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// int sequence = jPushMessage.getSequence();
|
||||
// //Logger.i(TAG,"action - onTagOperatorResult, sequence:"+sequence+",tags:"+jPushMessage.getTags());
|
||||
// //Logger.i(TAG,"tags size:"+jPushMessage.getTags().size());
|
||||
// init(context);
|
||||
// //根据sequence从之前操作缓存中获取缓存记录
|
||||
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
// if(tagAliasBean == null){
|
||||
//// Utils.showToast("获取缓存记录失败", context);
|
||||
// return;
|
||||
// }
|
||||
// if(jPushMessage.getErrorCode() == 0){
|
||||
// //Logger.i(TAG,"action - modify tag Success,sequence:"+sequence);
|
||||
// setActionCache.remove(sequence);
|
||||
// String logs = getActionStr(tagAliasBean.action)+" tags success";
|
||||
// //Logger.i(TAG,logs);
|
||||
// Utils.showToast(logs, context);
|
||||
// }else{
|
||||
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
|
||||
// if(jPushMessage.getErrorCode() == 6018){
|
||||
// //tag数量超过限制,需要先清除一部分再add
|
||||
// logs += ", tags is exceed limit need to clean";
|
||||
// }
|
||||
// logs += ", errorCode:" + jPushMessage.getErrorCode();
|
||||
// //Logger.e(TAG, logs);
|
||||
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
// Utils.showToast(logs, context);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
|
||||
// int sequence = jPushMessage.getSequence();
|
||||
// //Logger.i(TAG,"action - onCheckTagOperatorResult, sequence:"+sequence+",checktag:"+jPushMessage.getCheckTag());
|
||||
// init(context);
|
||||
// //根据sequence从之前操作缓存中获取缓存记录
|
||||
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
// if(tagAliasBean == null){
|
||||
//// Utils.showToast("获取缓存记录失败", context);
|
||||
// return;
|
||||
// }
|
||||
// if(jPushMessage.getErrorCode() == 0){
|
||||
// //Logger.i(TAG,"tagBean:"+tagAliasBean);
|
||||
// setActionCache.remove(sequence);
|
||||
// String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
|
||||
// //Logger.i(TAG,logs);
|
||||
// Utils.showToast(logs, context);
|
||||
// }else{
|
||||
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
|
||||
// //Logger.e(TAG, logs);
|
||||
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
// Utils.showToast(logs, context);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// int sequence = jPushMessage.getSequence();
|
||||
// //Logger.i(TAG,"action - onAliasOperatorResult, sequence:"+sequence+",alias:"+jPushMessage.getAlias());
|
||||
// init(context);
|
||||
// //根据sequence从之前操作缓存中获取缓存记录
|
||||
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
|
||||
// if(tagAliasBean == null){
|
||||
//// Utils.showToast("获取缓存记录失败", context);
|
||||
// return;
|
||||
// }
|
||||
// if(jPushMessage.getErrorCode() == 0){
|
||||
// //Logger.i(TAG,"action - modify alias Success,sequence:"+sequence);
|
||||
// setActionCache.remove(sequence);
|
||||
// String logs = getActionStr(tagAliasBean.action)+" alias success";
|
||||
// //Logger.i(TAG,logs);
|
||||
// Utils.showToast(logs, context);
|
||||
// }else{
|
||||
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
|
||||
// //Logger.e(TAG, logs);
|
||||
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
|
||||
// Utils.showToast(logs, context);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// //设置手机号码回调
|
||||
// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
|
||||
// int sequence = jPushMessage.getSequence();
|
||||
// //Logger.i(TAG,"action - onMobileNumberOperatorResult, sequence:"+sequence+",mobileNumber:"+jPushMessage.getMobileNumber());
|
||||
// init(context);
|
||||
// if(jPushMessage.getErrorCode() == 0){
|
||||
// //Logger.i(TAG,"action - set mobile number Success,sequence:"+sequence);
|
||||
// setActionCache.remove(sequence);
|
||||
// }else{
|
||||
// String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
|
||||
// //Logger.e(TAG, logs);
|
||||
// if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
|
||||
// Utils.showToast(logs, context);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// public static class TagAliasBean{
|
||||
// int action;
|
||||
// Set<String> tags;
|
||||
// String alias;
|
||||
// boolean isAliasAction;
|
||||
//
|
||||
// @Override
|
||||
// public String toString() {
|
||||
// return "TagAliasBean{" +
|
||||
// "action=" + action +
|
||||
// ", tags=" + tags +
|
||||
// ", alias='" + alias + '\'' +
|
||||
// ", isAliasAction=" + isAliasAction +
|
||||
// '}';
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//}
|
||||
@@ -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 "";
|
||||
|
||||
}
|
||||
}
|
||||
@@ -2,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;
|
||||
@@ -2,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();
|
||||
}
|
||||
@@ -2,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();
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.login;
|
||||
package com.hbl.lewan.login;
|
||||
|
||||
|
||||
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
|
||||
@@ -38,43 +38,45 @@ import androidx.annotation.RequiresApi;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.CustomTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityPhoneLoginBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.SelectCountryDialog;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.model.AvaterBean;
|
||||
import com.dskj.rbchat.model.CountryBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.PassWordLoginBean;
|
||||
import com.dskj.rbchat.model.RegisteredBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityPhoneLoginBinding;
|
||||
import com.hbl.lewan.databinding.ActivityRegisterBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.SelectCountryDialog;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.model.AvaterBean;
|
||||
import com.hbl.lewan.model.CountryBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.PassWordLoginBean;
|
||||
import com.hbl.lewan.model.RegisteredBean;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GetAndroidUniqueMark;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.PictureMimeType;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
@@ -102,10 +104,18 @@ import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
|
||||
import com.qiniu.android.storage.Configuration;
|
||||
import com.qiniu.android.storage.UploadManager;
|
||||
import com.qiniu.android.storage.UploadOptions;
|
||||
import com.yalantis.ucrop.UCrop;
|
||||
import com.yalantis.ucrop.UCropImageEngine;
|
||||
|
||||
import org.json.JSONException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
@@ -273,6 +283,7 @@ public class RegisterActivity extends BaseActivity {
|
||||
}
|
||||
}
|
||||
});
|
||||
activityWelcomeBinding.areaTv.setText(ApiService.AREA_CODE);
|
||||
|
||||
activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
|
||||
activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
|
||||
@@ -829,7 +840,6 @@ public class RegisterActivity extends BaseActivity {
|
||||
|
||||
private void loginIM(String account, String token) {
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
LoginInfo loginInfo =
|
||||
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
|
||||
.withAppKey(DataUtils.readAppKey(this))
|
||||
@@ -845,8 +855,11 @@ public class RegisterActivity extends BaseActivity {
|
||||
|
||||
@Override
|
||||
public void onSuccess(@Nullable LoginInfo data) {
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
|
||||
DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
|
||||
DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
|
||||
DataUtils.set(RegisterActivity.this,"last_login_time",System.currentTimeMillis());
|
||||
showMainActivityAndFinish();
|
||||
}
|
||||
});
|
||||
@@ -894,18 +907,37 @@ public class RegisterActivity extends BaseActivity {
|
||||
|
||||
|
||||
|
||||
StsCredentialsBean stsCredentialsBean;
|
||||
String stsCredentialsBean;
|
||||
|
||||
private void toShangchuanAli(File file ) {
|
||||
showLoadingDialog();
|
||||
Api.getInstance().stsCredentials()
|
||||
// Api.getInstance().stsCredentials()
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
// stsCredentialsBean = feedbackResp.data;
|
||||
// toAliYunOss(file);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
Api.getInstance().stsCredentials1()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss(file);
|
||||
// toAliYunOss(file, isHead);
|
||||
toQIiNiuYunOss(file);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -916,74 +948,151 @@ public class RegisterActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
|
||||
private void toAliYunOss(File file ) {
|
||||
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
String bucketName = IMUIKitConfig.bucketName;
|
||||
private void toQIiNiuYunOss(File file) {
|
||||
String updatePathPic = "postHomepageBackground";
|
||||
String updatePathPicHead = "userAvatarFileName";
|
||||
|
||||
// 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());
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
1054
app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java
Normal file
1054
app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java
Normal file
@@ -0,0 +1,1054 @@
|
||||
//// Copyright (c) 2022 NetEase, Inc. All rights reserved.
|
||||
//// Use of this source code is governed by a MIT license that can be
|
||||
//// found in the LICENSE file.
|
||||
//
|
||||
//package com.hbl.lewan.login;
|
||||
//
|
||||
//
|
||||
//import android.Manifest;
|
||||
//import android.app.Activity;
|
||||
//import android.content.Context;
|
||||
//import android.content.Intent;
|
||||
//import android.graphics.Bitmap;
|
||||
//import android.graphics.Color;
|
||||
//import android.graphics.drawable.Drawable;
|
||||
//import android.net.Uri;
|
||||
//import android.os.Build;
|
||||
//import android.os.Bundle;
|
||||
//import android.os.CountDownTimer;
|
||||
//import android.os.Handler;
|
||||
//import android.text.Html;
|
||||
//import android.text.SpannableStringBuilder;
|
||||
//import android.text.Spanned;
|
||||
//import android.text.TextUtils;
|
||||
//import android.text.method.LinkMovementMethod;
|
||||
//import android.view.MotionEvent;
|
||||
//import android.view.View;
|
||||
//import android.view.inputmethod.InputMethodManager;
|
||||
//import android.widget.ImageView;
|
||||
//import android.widget.TextView;
|
||||
//
|
||||
//import androidx.activity.result.ActivityResultLauncher;
|
||||
//import androidx.activity.result.contract.ActivityResultContracts;
|
||||
//import androidx.annotation.NonNull;
|
||||
//import androidx.annotation.Nullable;
|
||||
//import androidx.annotation.RequiresApi;
|
||||
//import androidx.core.content.ContextCompat;
|
||||
//import androidx.fragment.app.Fragment;
|
||||
//
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.bumptech.glide.Glide;
|
||||
//import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
//import com.bumptech.glide.request.RequestOptions;
|
||||
//import com.bumptech.glide.request.target.CustomTarget;
|
||||
//import com.bumptech.glide.request.transition.Transition;
|
||||
//import com.hbl.lewan.IMApplication;
|
||||
//import com.hbl.lewan.IMUIKitConfig;
|
||||
//import com.hbl.lewan.R;
|
||||
//import com.hbl.lewan.databinding.ActivityRegisterBfBinding;
|
||||
//import com.hbl.lewan.databinding.ActivityRegisterBinding;
|
||||
//import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
//import com.hbl.lewan.dialog.SelectCountryDialog;
|
||||
//import com.hbl.lewan.main.MainActivity;
|
||||
//import com.hbl.lewan.model.CountryBean;
|
||||
//import com.hbl.lewan.model.LoginBean;
|
||||
//import com.hbl.lewan.model.PassWordLoginBean;
|
||||
//import com.hbl.lewan.model.RegisteredBean;
|
||||
//import com.hbl.lewan.model.StsCredentialsBean;
|
||||
//import com.hbl.lewan.network.Api;
|
||||
//import com.hbl.lewan.network.BaseObserver;
|
||||
//import com.hbl.lewan.network.Result;
|
||||
//import com.hbl.lewan.utils.AnimUtil;
|
||||
//import com.hbl.lewan.utils.AppUtils;
|
||||
//import com.hbl.lewan.utils.Constant;
|
||||
//import com.hbl.lewan.utils.DataUtils;
|
||||
//import com.hbl.lewan.utils.GetAndroidUniqueMark;
|
||||
//import com.hbl.lewan.utils.GsonUtils;
|
||||
//import com.hbl.lewan.utils.LogUtils;
|
||||
//import com.hbl.lewan.utils.TaiWanIDCardUtils;
|
||||
//import com.luck.picture.lib.basic.PictureSelector;
|
||||
//import com.luck.picture.lib.config.PictureMimeType;
|
||||
//import com.luck.picture.lib.config.SelectMimeType;
|
||||
//import com.luck.picture.lib.engine.CropFileEngine;
|
||||
//import com.luck.picture.lib.entity.LocalMedia;
|
||||
//import com.luck.picture.lib.interfaces.OnResultCallbackListener;
|
||||
//import com.luck.picture.lib.style.BottomNavBarStyle;
|
||||
//import com.luck.picture.lib.style.PictureSelectorStyle;
|
||||
//import com.luck.picture.lib.style.SelectMainStyle;
|
||||
//import com.luck.picture.lib.style.TitleBarStyle;
|
||||
//import com.luck.picture.lib.utils.StyleUtils;
|
||||
//import com.netease.nimlib.sdk.auth.LoginInfo;
|
||||
//import com.netease.yunxin.kit.alog.ALog;
|
||||
//import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
|
||||
//import com.netease.yunxin.kit.chatkit.ui.dialog.PermissionExplainDialog;
|
||||
//import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
//import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
|
||||
//import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
|
||||
//import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
//import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
//import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
//import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
|
||||
//import com.yalantis.ucrop.UCrop;
|
||||
//import com.yalantis.ucrop.UCropImageEngine;
|
||||
//
|
||||
//import java.io.File;
|
||||
//import java.util.ArrayList;
|
||||
//import java.util.HashMap;
|
||||
//import java.util.Map;
|
||||
//import java.util.UUID;
|
||||
//
|
||||
//import cn.iwgang.simplifyspan.customspan.CustomClickableSpan;
|
||||
//import cn.iwgang.simplifyspan.other.CustomLinkMovementMethod;
|
||||
//import cn.iwgang.simplifyspan.unit.SpecialClickableUnit;
|
||||
//import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
//import io.reactivex.schedulers.Schedulers;
|
||||
//
|
||||
///**
|
||||
// * Welcome Page is launch page
|
||||
// */
|
||||
//@Deprecated
|
||||
//public class RegisterActivityBf extends BaseActivity {
|
||||
// protected ActivityResultLauncher<String[]> permissionLauncher;
|
||||
// String passwordCode = null;
|
||||
//
|
||||
// private static final String TAG = "WelcomeActivity";
|
||||
// private ActivityRegisterBfBinding activityWelcomeBinding;
|
||||
// int step = 1;
|
||||
// int sexType = 1;
|
||||
// CountryBean countryBean;
|
||||
// String avater = null;
|
||||
// long lastTime =0;
|
||||
// PermissionExplainDialog permissionExplainDialog;
|
||||
//
|
||||
// @RequiresApi(api = Build.VERSION_CODES.M)
|
||||
// @Override
|
||||
// protected void onCreate(Bundle savedInstanceState) {
|
||||
// super.onCreate(savedInstanceState);
|
||||
// getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
|
||||
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
|
||||
//
|
||||
// ALog.d(Constant.PROJECT_TAG, TAG, "onCreateView");
|
||||
// IMApplication.setColdStart(true);
|
||||
// activityWelcomeBinding = ActivityRegisterBfBinding.inflate(getLayoutInflater());
|
||||
// setContentView(activityWelcomeBinding.getRoot());
|
||||
// myCountDownTimer = new MyCountDownTimer(60000, 1000);
|
||||
//
|
||||
// activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
|
||||
// onBackPressed();
|
||||
// });
|
||||
// setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
|
||||
//
|
||||
// countryBean = DataUtils.getLocCountry(RegisterActivityBf.this);
|
||||
// changeArea();
|
||||
// activityWelcomeBinding.areaTv.setOnClickListener(v -> {
|
||||
// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivityBf.this);
|
||||
// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
|
||||
// @Override
|
||||
// public void toType(CountryBean type) {
|
||||
// countryBean = type;
|
||||
// changeArea();
|
||||
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
|
||||
// }
|
||||
// });
|
||||
// selectCountryDialog.show();
|
||||
// });
|
||||
// activityWelcomeBinding.nextIv.setOnClickListener(v -> {
|
||||
// if(lastTime>0){
|
||||
// if(System.currentTimeMillis()-lastTime<2000){
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// lastTime = System.currentTimeMillis();
|
||||
// if (step < 5) {
|
||||
// if (step == 1) {
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.phoneEt.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.sjhbnwk_txt);
|
||||
// return;
|
||||
// }
|
||||
// checkPhone();
|
||||
// } else if (step == 2) {
|
||||
// if (TextUtils.isEmpty(passwordCode)||passwordCode.length()!=4) {
|
||||
// ToastX.showShortToast(R.string.dxyzmbnwk_txt);
|
||||
// return;
|
||||
// }
|
||||
// checkVerfyCode();
|
||||
// } else if (step == 3) {
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.mimabunengweikong_txt);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if(!DataUtils.checkPassword(activityWelcomeBinding.passwordEt.getText().toString().trim())){
|
||||
// ToastX.showShortToast(R.string.qjcmmgs_txt);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if(activityWelcomeBinding.passwordEt.getText().toString().trim().length()<8){
|
||||
// ToastX.showShortToast(R.string.qjcmmgs_txt1);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.qrmmbnwk_txt);
|
||||
// return;
|
||||
// }
|
||||
// if (!activityWelcomeBinding.passwordEt.getText().toString().trim().equals(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.mimaquernemimabuyizhi_txt);
|
||||
// return;
|
||||
// }
|
||||
// hideSoftInput(this);
|
||||
// new Handler().postDelayed(() -> {
|
||||
// step += 1;
|
||||
// changeStep();
|
||||
// }, 500);
|
||||
// }else if (step == 4) {
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.nicknameEt.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.nichengbunengweik_txt);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// hideSoftInput(this);
|
||||
// new Handler().postDelayed(() -> {
|
||||
// step += 1;
|
||||
// changeStep();
|
||||
// }, 500);
|
||||
// }
|
||||
//
|
||||
// } else {
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.trueNameEt.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.zhenshixingmingbunengweik_txt);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if (TextUtils.isEmpty(activityWelcomeBinding.cardNumberEt.getText().toString().trim())) {
|
||||
// ToastX.showShortToast(R.string.shenfenzbunengwiek_txt);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if(!TaiWanIDCardUtils.checkTaiWanIdCardNumber(activityWelcomeBinding.cardNumberEt.getText().toString().trim())){
|
||||
// ToastX.showShortToast(R.string.qsrzqsfzh_txt);
|
||||
//
|
||||
// return ;
|
||||
// }
|
||||
//
|
||||
// hideSoftInput(this);
|
||||
// phoneRegister();
|
||||
//// loginIM(account, token);
|
||||
// }
|
||||
// });
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setOnClickListener(v -> {
|
||||
// step = 3;
|
||||
// changeStep();
|
||||
// });
|
||||
//
|
||||
// activityWelcomeBinding.changePassTv.setOnClickListener(v -> {
|
||||
// step = 2;
|
||||
// changeStep();
|
||||
// });
|
||||
// activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
|
||||
// passwordCode = code;
|
||||
//
|
||||
// });
|
||||
//
|
||||
//
|
||||
// activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
|
||||
// toStep2();
|
||||
// });
|
||||
//
|
||||
// activityWelcomeBinding.headRy.setOnClickListener(v -> {
|
||||
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
// if (PermissionUtils.hasPermissions(
|
||||
// RegisterActivityBf.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
|
||||
// startPickMedia();
|
||||
// } else {
|
||||
// permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
|
||||
// permissionExplainDialog.show();
|
||||
// permissionLauncher.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO});
|
||||
//
|
||||
// }
|
||||
// } else {
|
||||
// if (PermissionUtils.hasPermissions(
|
||||
// RegisterActivityBf.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
|
||||
// startPickMedia();
|
||||
// } else {
|
||||
// permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
|
||||
// permissionExplainDialog.show();
|
||||
// permissionLauncher.launch(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE});
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
|
||||
// activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
|
||||
// activityWelcomeBinding.nvIv.setOnClickListener(v -> changeSex(0));
|
||||
// activityWelcomeBinding.nvTv.setOnClickListener(v -> changeSex(0));
|
||||
//
|
||||
// AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
|
||||
// activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv, activityWelcomeBinding.areaTv,
|
||||
// activityWelcomeBinding.headRy, activityWelcomeBinding.nanIv, activityWelcomeBinding.nvIv);
|
||||
//
|
||||
// permissionLauncher =
|
||||
// registerForActivityResult(
|
||||
// new ActivityResultContracts.RequestMultiplePermissions(),
|
||||
// result -> {
|
||||
// if (result != null) {
|
||||
// for (Map.Entry<String, Boolean> entry : result.entrySet()) {
|
||||
// String permission = entry.getKey().toString();
|
||||
// boolean grant = (Boolean) entry.getValue();
|
||||
// if (grant) {
|
||||
// if (TextUtils.equals(
|
||||
// permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
|
||||
// permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
|
||||
// permission, Manifest.permission.READ_MEDIA_VIDEO)) {
|
||||
// startPickMedia();
|
||||
// }
|
||||
// } else {
|
||||
// if (shouldShowRequestPermissionRationale(permission)) {
|
||||
// ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_deny_tips));
|
||||
// } else {
|
||||
// ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage));
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (permissionExplainDialog != null) {
|
||||
// permissionExplainDialog.dismiss();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private void checkVerfyCode() {
|
||||
// Map<String, Object> maps = new HashMap<>();
|
||||
// maps.put("verifyCode", passwordCode);
|
||||
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
// maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
// }
|
||||
// Api.getInstance().preCheckVerifyCode(maps)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<RegisteredBean>>() {
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(Result<RegisteredBean> feedbackResp) {
|
||||
//// dimessLoadingDialog();
|
||||
// if (feedbackResp.data.isCorrect()) {
|
||||
// new Handler().postDelayed(() -> {
|
||||
// step += 1;
|
||||
// changeStep();
|
||||
// }, 500);
|
||||
// } else {
|
||||
// ToastX.showShortToast(R.string.yzmbzq_txt);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
//// dimessLoadingDialog();
|
||||
// LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
// ToastX.showShortToast( msg);
|
||||
//
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private void checkPhone() {
|
||||
// hideSoftInput(RegisterActivityBf.this);
|
||||
// Map<String, Object> maps = new HashMap<>();
|
||||
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
// maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
// }
|
||||
// Api.getInstance().registered(maps)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<RegisteredBean>>() {
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(Result<RegisteredBean> feedbackResp) {
|
||||
// if (!feedbackResp.data.isRegistered()) {
|
||||
//// checkVerfyCode();
|
||||
// new Handler().postDelayed(() -> {
|
||||
// step += 1;
|
||||
// changeStep();
|
||||
// }, 500);
|
||||
//
|
||||
// } else {
|
||||
// ToastX.showShortToast(R.string.yzczjdl_txt);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
// ToastX.showShortToast(msg);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void phoneRegister() {
|
||||
// Map<String, Object> maps = new HashMap<>();
|
||||
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
// maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
// maps.put("nickname", activityWelcomeBinding.nicknameEt.getText().toString().trim());
|
||||
// maps.put("password", activityWelcomeBinding.passwordEt.getText().toString().trim());
|
||||
// maps.put("verifyCode", passwordCode);
|
||||
// if (!TextUtils.isEmpty(avater)) {
|
||||
// maps.put("avatar", avater);
|
||||
// }
|
||||
// maps.put("sex", sexType);
|
||||
// maps.put("realName", activityWelcomeBinding.trueNameEt.getText().toString().trim());
|
||||
// maps.put("idCard", activityWelcomeBinding.cardNumberEt.getText().toString().trim());
|
||||
//
|
||||
// if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
// }
|
||||
// Api.getInstance().phoneRegister(maps)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<String> feedbackResp) {
|
||||
// doLogin();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
// ToastX.showShortToast(msg);
|
||||
// }
|
||||
// });
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 实施登录的方法.
|
||||
// * <p>
|
||||
// * 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理.
|
||||
// *
|
||||
// */
|
||||
// private void doLogin() {
|
||||
//
|
||||
// String uidOrMail = String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim().toLowerCase();
|
||||
// String loginPsw = String.valueOf(activityWelcomeBinding.passwordEt.getText()).trim();
|
||||
//
|
||||
// PassWordLoginBean passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
|
||||
// GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this),IMUIKitConfig.SUBSTATIONID);
|
||||
// if(TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)){
|
||||
// passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
|
||||
// GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this));
|
||||
// }
|
||||
// Api.getInstance().passwordLogin(passWordLoginBean)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<>() {
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(Result<LoginBean> feedbackResp) {
|
||||
//
|
||||
// if(TextUtils.isEmpty(feedbackResp.data.getUser().getChatToken())){
|
||||
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.zhbhf_jqsb_txt), false);
|
||||
// actionConfirmDialog.show();
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// DataUtils.set(RegisterActivityBf.this,"login_bean", GsonUtils.beanToJSONString(feedbackResp.data));
|
||||
//
|
||||
// loginIM(feedbackResp.data.getUser_uid(),feedbackResp.data.getUser().getChatToken());
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
//// dimessLoadingDialog();
|
||||
// LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
// ToastX.showShortToast( msg);
|
||||
//
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
//
|
||||
////
|
||||
//// AvaterBean avaterBean = null;
|
||||
////
|
||||
//// private void updateImage(File file) {
|
||||
//// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
|
||||
//// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("file", file.getName(), imageBody);
|
||||
//// Api.getInstance().uploadUserAvatar(imageBodyPart)
|
||||
//// .subscribeOn(Schedulers.io())
|
||||
//// .observeOn(AndroidSchedulers.mainThread())
|
||||
//// .subscribe(new BaseObserver<Result<AvaterBean>>() {
|
||||
////
|
||||
//// @Override
|
||||
//// public void onSuccess(Result<AvaterBean> feedbackResp) {
|
||||
//// avaterBean = feedbackResp.data;
|
||||
//// }
|
||||
////
|
||||
//// @Override
|
||||
//// public void onError(int code, String msg) {
|
||||
//// }
|
||||
//// });
|
||||
//// }
|
||||
//
|
||||
//
|
||||
// private void toStep2() {
|
||||
// hideSoftInput(RegisterActivityBf.this);
|
||||
// Map<String, String> maps = new HashMap<>();
|
||||
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
|
||||
// maps.put("areaCode", countryBean.getAreaCodeName());
|
||||
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
// }
|
||||
// Api.getInstance().sendSmsForRegister(maps)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<String>>() {
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(Result<String> feedbackResp) {
|
||||
// myCountDownTimer.start();
|
||||
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.yzmyfs_txt), false);
|
||||
// actionConfirmDialog.show();
|
||||
// activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt1),
|
||||
// countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// LogUtils.i("获取到的错误:" + code + "" + msg);
|
||||
// ToastX.showShortToast(msg);
|
||||
// }
|
||||
// });
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// MyCountDownTimer myCountDownTimer;
|
||||
//
|
||||
// //倒计时函数
|
||||
// private class MyCountDownTimer extends CountDownTimer {
|
||||
//
|
||||
// public MyCountDownTimer(long millisInFuture, long countDownInterval) {
|
||||
// super(millisInFuture, countDownInterval);
|
||||
// }
|
||||
//
|
||||
// //计时过程
|
||||
// @Override
|
||||
// public void onTick(long l) {
|
||||
// //防止计时过程中重复点击
|
||||
// activityWelcomeBinding.sendSmsTv.setClickable(false);
|
||||
//// getcodeTv.setTextColor(getResources().getColor(R.color.color_adb5bd));
|
||||
// activityWelcomeBinding.sendSmsTv.setText(String.format(getString(R.string.get_code1_txt), (l / 1000)));
|
||||
//
|
||||
// }
|
||||
//
|
||||
// //计时完毕的方法
|
||||
// @Override
|
||||
// public void onFinish() {
|
||||
// //重新给Button设置文字
|
||||
// activityWelcomeBinding.sendSmsTv.setText(R.string.get_code_txt);
|
||||
// //设置可点击
|
||||
// activityWelcomeBinding.sendSmsTv.setClickable(true);
|
||||
//// getcodeTv.setTextColor(getResources().getColor(R.color.colorAccent));
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 隐藏软键盘
|
||||
// */
|
||||
// public void hideSoftInput(Activity activity) {
|
||||
// InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
|
||||
// if (getCurrentFocus() != null && null != imm) {
|
||||
// imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
|
||||
// }
|
||||
//// View view = activity.getCurrentFocus();
|
||||
////
|
||||
//// if (view != null) {
|
||||
////
|
||||
//// InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
|
||||
////
|
||||
//// inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
|
||||
////
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void changeSex(int i) {
|
||||
// sexType = i;
|
||||
// activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_f);
|
||||
// activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_f);
|
||||
// if (i == 1) {
|
||||
// activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_t);
|
||||
// } else {
|
||||
// activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_t);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onBackPressed() {
|
||||
// if (step == 1) {
|
||||
// super.onBackPressed();
|
||||
// } else {
|
||||
// step -= 1;
|
||||
// changeStep();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private void changeStep() {
|
||||
// switch (step) {
|
||||
// case 1:
|
||||
// activityWelcomeBinding.step1Ly.setVisibility(View.VISIBLE);
|
||||
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
// break;
|
||||
// case 2:
|
||||
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step3Ly.setVisibility(View.VISIBLE);
|
||||
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt),
|
||||
// countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
|
||||
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
//
|
||||
// break;
|
||||
// case 3:
|
||||
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step2Ly.setVisibility(View.VISIBLE);
|
||||
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
//
|
||||
// break;
|
||||
//
|
||||
// case 4:
|
||||
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step4Ly.setVisibility(View.VISIBLE);
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
|
||||
//
|
||||
// break;
|
||||
//
|
||||
// case 5:
|
||||
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.step5Ly.setVisibility(View.VISIBLE);
|
||||
//
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// PictureSelectorStyle selectorStyle;
|
||||
// LocalMedia localMedia = null;
|
||||
//
|
||||
// protected void startPickMedia() {
|
||||
//// pickMediaLauncher.launch("image/*;video/*");
|
||||
//
|
||||
// TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
|
||||
// whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
// whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down);
|
||||
// whiteTitleBarStyle.setTitleLeftBackResource(com.netease.yunxin.kit.common.ui.R.drawable.ic_back);
|
||||
// whiteTitleBarStyle.setTitleTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
|
||||
// whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
// whiteTitleBarStyle.setDisplayTitleBarLine(true);
|
||||
//
|
||||
// BottomNavBarStyle whiteBottomNavBarStyle = new BottomNavBarStyle();
|
||||
// whiteBottomNavBarStyle.setBottomNarBarBackgroundColor(Color.parseColor("#FFFFFF"));
|
||||
// whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
//
|
||||
// whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
|
||||
// whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
|
||||
// whiteBottomNavBarStyle.setCompleteCountTips(false);
|
||||
// whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
// whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
|
||||
//
|
||||
// SelectMainStyle selectMainStyle = new SelectMainStyle();
|
||||
// selectMainStyle.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
// selectMainStyle.setDarkStatusBarBlack(true);
|
||||
// selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
|
||||
// selectMainStyle.setSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
|
||||
// selectMainStyle.setPreviewSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_demo_white_preview_selector);
|
||||
// selectMainStyle.setSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_checkbox_selector);
|
||||
//// selectMainStyle.setSelectText(R.string.ps_done_front_num);
|
||||
// selectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
// selectorStyle = new PictureSelectorStyle();
|
||||
// selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
|
||||
// selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
|
||||
// selectorStyle.setSelectMainStyle(selectMainStyle);
|
||||
//
|
||||
//
|
||||
// PictureSelector.create(this)
|
||||
// .openGallery(SelectMimeType.ofImage())
|
||||
// .setImageEngine(GlideEngine.createGlideEngine())
|
||||
// .setCropEngine(new ImageFileCropEngine())
|
||||
// .setMaxSelectNum(1)
|
||||
// .setSelectorUIStyle(selectorStyle)
|
||||
// .forResult(new OnResultCallbackListener<>() {
|
||||
// @Override
|
||||
// public void onResult(ArrayList<LocalMedia> result) {
|
||||
// if (result.size() > 0) {
|
||||
// Glide.with(RegisterActivityBf.this)
|
||||
// .load(result.get(0).getAvailablePath())
|
||||
// .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
|
||||
// .into(activityWelcomeBinding.headIv);
|
||||
// localMedia = result.get(0);
|
||||
// toShangchuanAli(new File(result.get(0).getAvailablePath()));
|
||||
//// updateImage(new File(result.get(0).getAvailablePath()));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onCancel() {
|
||||
//
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 自定义裁剪
|
||||
// */
|
||||
// private class ImageFileCropEngine implements CropFileEngine {
|
||||
//
|
||||
// @Override
|
||||
// public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
|
||||
// UCrop.Options options = buildOptions();
|
||||
// UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
|
||||
// uCrop.withOptions(options);
|
||||
// uCrop.setImageEngine(new UCropImageEngine() {
|
||||
// @Override
|
||||
// public void loadImage(Context context, String url, ImageView imageView) {
|
||||
// if (!AppUtils.assertValidRequest(context)) {
|
||||
// return;
|
||||
// }
|
||||
// Glide.with(context).load(url).override(180, 180).into(imageView);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
|
||||
// Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() {
|
||||
// @Override
|
||||
// public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
|
||||
// if (call != null) {
|
||||
// call.onCall(resource);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onLoadCleared(@Nullable Drawable placeholder) {
|
||||
// if (call != null) {
|
||||
// call.onCall(null);
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
// uCrop.start(fragment.requireActivity(), fragment, requestCode);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 配制UCrop，可根据需求自我扩展
|
||||
// *
|
||||
// * @return
|
||||
// */
|
||||
// private UCrop.Options buildOptions() {
|
||||
// UCrop.Options options = new UCrop.Options();
|
||||
// options.setHideBottomControls(false);
|
||||
// options.setFreeStyleCropEnabled(true);
|
||||
// options.setShowCropFrame(true);
|
||||
// options.setShowCropGrid(true);
|
||||
// options.setCircleDimmedLayer(false);
|
||||
// options.withAspectRatio(1, 1);
|
||||
// options.setCropOutputPathDir(getSandboxPath());
|
||||
// options.isCropDragSmoothToCenter(false);
|
||||
// options.setSkipCropMimeType(new String[]{PictureMimeType.ofGIF(), PictureMimeType.ofWEBP()});
|
||||
// options.isForbidCropGifWebp(true);
|
||||
// options.isForbidSkipMultipleCrop(true);
|
||||
// options.setMaxScaleMultiplier(100);
|
||||
// if (selectorStyle != null && selectorStyle.getSelectMainStyle().getStatusBarColor() != 0) {
|
||||
// SelectMainStyle mainStyle = selectorStyle.getSelectMainStyle();
|
||||
// boolean isDarkStatusBarBlack = mainStyle.isDarkStatusBarBlack();
|
||||
// int statusBarColor = mainStyle.getStatusBarColor();
|
||||
// options.isDarkStatusBarBlack(isDarkStatusBarBlack);
|
||||
// if (StyleUtils.checkStyleValidity(statusBarColor)) {
|
||||
// options.setStatusBarColor(statusBarColor);
|
||||
// options.setToolbarColor(statusBarColor);
|
||||
// } else {
|
||||
// options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
// options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
// }
|
||||
// TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
|
||||
// if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
|
||||
// options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
|
||||
// } else {
|
||||
// options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
|
||||
// }
|
||||
// } else {
|
||||
// options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
// options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
|
||||
// options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
|
||||
// }
|
||||
// return options;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 创建自定义输出目录
|
||||
// *
|
||||
// * @return
|
||||
// */
|
||||
// private String getSandboxPath() {
|
||||
// File externalFilesDir = getExternalFilesDir("");
|
||||
// File customFile = new File(externalFilesDir.getAbsolutePath(), "Sandbox");
|
||||
// if (!customFile.exists()) {
|
||||
// customFile.mkdirs();
|
||||
// }
|
||||
// return customFile.getAbsolutePath() + File.separator;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void changeArea() {
|
||||
// activityWelcomeBinding.areaTv.setText(countryBean.getCountryName() + countryBean.getAreaCodeName());
|
||||
// }
|
||||
//
|
||||
// private void showMainActivityAndFinish() {
|
||||
// ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
|
||||
// Intent intent = new Intent();
|
||||
// intent.setClass(this, MainActivity.class);
|
||||
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
// this.startActivity(intent);
|
||||
// finish();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void loginIM(String account, String token) {
|
||||
// ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
|
||||
// activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
// LoginInfo loginInfo =
|
||||
// LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
|
||||
// .withAppKey(DataUtils.readAppKey(this))
|
||||
// .build();
|
||||
// IMKitClient.loginIM(
|
||||
// loginInfo,
|
||||
// new LoginCallback<LoginInfo>() {
|
||||
// @Override
|
||||
// public void onError(int errorCode, @NonNull String errorMsg) {
|
||||
// ToastX.showShortToast(
|
||||
// String.format(getResources().getString(R.string.login_fail), errorCode));
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onSuccess(@Nullable LoginInfo data) {
|
||||
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
|
||||
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_TOKEN, token);
|
||||
// showMainActivityAndFinish();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// private void setPrivacyContent(TextView contentView) {
|
||||
//
|
||||
// SpannableStringBuilder stringBuilder = new SpannableStringBuilder(getString(R.string.denglujitongyi_txt));
|
||||
//
|
||||
// int len = stringBuilder.length();
|
||||
//
|
||||
// stringBuilder.append(getString(R.string.fuwuxieyi_txt));
|
||||
//
|
||||
// SpecialClickableUnit unit = new SpecialClickableUnit(contentView,
|
||||
// (tv, clickableSpan) -> {
|
||||
// BrowseActivity.Companion.launch(
|
||||
// RegisterActivityBf.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_SERVICE_CN_URL);
|
||||
// });
|
||||
// unit.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
// unit.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
// unit.showUnderline();
|
||||
// CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
|
||||
// stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
// stringBuilder.append(getString(R.string.yiji_txt));
|
||||
// len = stringBuilder.length();
|
||||
// stringBuilder.append(getString(R.string.yinsizhengche_txt));
|
||||
// SpecialClickableUnit unit1 = new SpecialClickableUnit(contentView,
|
||||
// (tv, clickableSpan) -> {
|
||||
// BrowseActivity.Companion.launch(
|
||||
// RegisterActivityBf.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
|
||||
// });
|
||||
// unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
// unit1.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
|
||||
// unit1.showUnderline();
|
||||
// CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
|
||||
// stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
//
|
||||
// contentView.setText(stringBuilder);
|
||||
// contentView.setClickable(false);
|
||||
// contentView.setMovementMethod(CustomLinkMovementMethod.getInstance());//不设置 没有点击事件
|
||||
// contentView.setHighlightColor(Color.TRANSPARENT); //设置点击后的颜色为透明
|
||||
// contentView.setMovementMethod(LinkMovementMethod.getInstance());//不设置点击会失效
|
||||
//
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// StsCredentialsBean stsCredentialsBean;
|
||||
//
|
||||
// private void toShangchuanAli(File file ) {
|
||||
// showLoadingDialog();
|
||||
// Api.getInstance().stsCredentials()
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
// stsCredentialsBean = feedbackResp.data;
|
||||
// toAliYunOss(file);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void toAliYunOss(File file ) {
|
||||
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
// String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
// String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
// String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
// String bucketName = IMUIKitConfig.bucketName;
|
||||
//
|
||||
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
// toUpdateOss(bucketName, 0, oss, file);
|
||||
//
|
||||
// }
|
||||
// public static Handler handler = new Handler();
|
||||
//
|
||||
// //
|
||||
// private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
|
||||
// LogUtils.i("1111111111111111111");
|
||||
// String updatePathPicHead = "userAvatarFileName";
|
||||
//
|
||||
// LogUtils.i("22222222222222222");
|
||||
//
|
||||
// String fileName = UUID.randomUUID().toString() + "_" + file.getName();
|
||||
// LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
|
||||
// LogUtils.i("文件地址是啥1：" + file.getPath());
|
||||
//
|
||||
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
|
||||
//
|
||||
// put.setProgressCallback((request, currentSize, totalSize) -> {
|
||||
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
|
||||
//
|
||||
// });
|
||||
// LogUtils.i("55555555555555");
|
||||
//
|
||||
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
|
||||
// @Override
|
||||
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
|
||||
// LogUtils.i("PutObject", "UploadSuccess");
|
||||
// LogUtils.i("ETag", result.getETag());
|
||||
// LogUtils.i("RequestId", result.getRequestId());
|
||||
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
|
||||
//
|
||||
// handler.post(() -> {
|
||||
// dimessLoadingDialog();
|
||||
// avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
|
||||
// dimessLoadingDialog();
|
||||
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
|
||||
//
|
||||
// // 请求异常。
|
||||
// if (clientExcepion != null) {
|
||||
// // 本地异常，如网络异常等。
|
||||
// clientExcepion.printStackTrace();
|
||||
// }
|
||||
// if (serviceException != null) {
|
||||
// // 服务异常。
|
||||
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
|
||||
// LogUtils.i("RequestId", serviceException.getRequestId());
|
||||
// LogUtils.i("HostId", serviceException.getHostId());
|
||||
// LogUtils.i("RawMessage", serviceException.getRawMessage());
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// public LoadingDialog loadingDialog;
|
||||
//
|
||||
// public void showLoadingDialog() {
|
||||
// if (loadingDialog == null)
|
||||
// loadingDialog = new LoadingDialog(this);
|
||||
// loadingDialog.show();
|
||||
// }
|
||||
//
|
||||
// public void showLoadingDialog(String msg) {
|
||||
// if (loadingDialog == null)
|
||||
// loadingDialog = new LoadingDialog(this);
|
||||
// loadingDialog.setLoadingText(msg);
|
||||
// loadingDialog.show();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// public void dimessLoadingDialog() {
|
||||
// if (loadingDialog != null) {
|
||||
// loadingDialog.dismiss();
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// public boolean onTouchEvent(MotionEvent event) {
|
||||
// if(null != this.getCurrentFocus()){
|
||||
// /**
|
||||
// * 点击空白位置 隐藏软键盘
|
||||
// */
|
||||
// InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
|
||||
// return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
|
||||
// }
|
||||
// return super .onTouchEvent(event);
|
||||
// }
|
||||
//
|
||||
//}
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.login;
|
||||
package com.hbl.lewan.login;
|
||||
|
||||
|
||||
import android.Manifest;
|
||||
@@ -37,45 +37,45 @@ import androidx.annotation.RequiresApi;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.CustomTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityWangjiBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.SelectCountryDialog;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangePasswordActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.CountryBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.PassWordLoginBean;
|
||||
import com.dskj.rbchat.model.RegisteredBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.welcome.WelcomeActivity;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityRegisterBinding;
|
||||
import com.hbl.lewan.databinding.ActivityWangjiBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.SelectCountryDialog;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.main.mine.ChangePasswordActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.CountryBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.PassWordLoginBean;
|
||||
import com.hbl.lewan.model.RegisteredBean;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GetAndroidUniqueMark;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.PictureMimeType;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
131
app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java
Normal file
131
app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java
Normal file
@@ -0,0 +1,131 @@
|
||||
//// Copyright (c) 2022 NetEase, Inc. All rights reserved.
|
||||
//// Use of this source code is governed by a MIT license that can be
|
||||
//// found in the LICENSE file.
|
||||
//
|
||||
//package com.hbl.lewan.main;
|
||||
//
|
||||
//import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
|
||||
//import com.netease.nimlib.sdk.msg.MessageBuilder;
|
||||
//import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment;
|
||||
//import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
|
||||
//import com.netease.nimlib.sdk.msg.model.IMMessage;
|
||||
//import com.netease.yunxin.kit.alog.ALog;
|
||||
//import com.netease.yunxin.kit.alog.ParameterMap;
|
||||
//import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
|
||||
//import com.netease.yunxin.kit.common.utils.NetworkUtils;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.model.impl.DefaultCallOrderImpl;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.model.impl.state.CallState;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.utils.CallParams;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.utils.NrtcCallStatus;
|
||||
//import java.util.Collections;
|
||||
//import java.util.List;
|
||||
//
|
||||
//class CustomCallOrderHelper extends DefaultCallOrderImpl {
|
||||
// private static final String TAG = "CustomCallOrderHelper";
|
||||
//
|
||||
// @Override
|
||||
// public void onCanceled(ChannelType channelType, String accountId, int callType) {
|
||||
// ALog.dApi(
|
||||
// TAG,
|
||||
// new ParameterMap("onCanceled")
|
||||
// .append("channelType", channelType)
|
||||
// .append("callType", callType)
|
||||
// .append("accountId", accountId)
|
||||
// .append("enableOrder", isEnable())
|
||||
// .toValue());
|
||||
// if (!isEnable()) {
|
||||
// return;
|
||||
// }
|
||||
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onReject(ChannelType channelType, String accountId, int callType) {
|
||||
// ALog.dApi(
|
||||
// TAG,
|
||||
// new ParameterMap("onReject")
|
||||
// .append("channelType", channelType)
|
||||
// .append("callType", callType)
|
||||
// .append("accountId", accountId)
|
||||
// .append("enableOrder", isEnable())
|
||||
// .toValue());
|
||||
// if (!isEnable()) {
|
||||
// return;
|
||||
// }
|
||||
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusRejected, callType);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onTimeout(ChannelType channelType, String accountId, int callType) {
|
||||
// ALog.dApi(
|
||||
// TAG,
|
||||
// new ParameterMap("onTimeout")
|
||||
// .append("channelType", channelType)
|
||||
// .append("callType", callType)
|
||||
// .append("accountId", accountId)
|
||||
// .append("enableOrder", isEnable())
|
||||
// .toValue());
|
||||
// if (!isEnable()) {
|
||||
// return;
|
||||
// }
|
||||
// if (NERTCVideoCall.sharedInstance().getCurrentState() == CallState.STATE_INVITED) {
|
||||
// return;
|
||||
// }
|
||||
// if (NetworkUtils.isConnected()) {
|
||||
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusTimeout, callType);
|
||||
// } else {
|
||||
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onBusy(ChannelType channelType, String accountId, int callType) {
|
||||
// ALog.dApi(
|
||||
// TAG,
|
||||
// new ParameterMap("onBusy")
|
||||
// .append("channelType", channelType)
|
||||
// .append("callType", callType)
|
||||
// .append("accountId", accountId)
|
||||
// .append("enableOrder", isEnable())
|
||||
// .toValue());
|
||||
// if (!isEnable()) {
|
||||
// return;
|
||||
// }
|
||||
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusBusy, callType);
|
||||
// }
|
||||
//
|
||||
// public static void sendOrder(
|
||||
// ChannelType channelType, String accountId, int status, int callType) {
|
||||
// sendOrder(channelType, accountId, status, Collections.emptyList(), callType);
|
||||
// }
|
||||
//
|
||||
// public static void sendOrder(
|
||||
// ChannelType channelType,
|
||||
// String accountId,
|
||||
// int status,
|
||||
// List<NetCallAttachment.Duration> durations,
|
||||
// int callType) {
|
||||
// ALog.dApi(
|
||||
// TAG,
|
||||
// new ParameterMap("sendOrder")
|
||||
// .append("status", status)
|
||||
// .append("channelType", channelType)
|
||||
// .append("callType", callType)
|
||||
// .append("durations", durations)
|
||||
// .append("accountId", accountId)
|
||||
// .toValue());
|
||||
// if (callType == CallParams.CallType.P2P) {
|
||||
// NetCallAttachment netCallAttachment =
|
||||
// new NetCallAttachment.NetCallAttachmentBuilder()
|
||||
// .withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue())
|
||||
// .withStatus(status)
|
||||
// .withDurations(durations)
|
||||
// .build();
|
||||
// IMMessage message =
|
||||
// MessageBuilder.createNrtcNetcallMessage(
|
||||
// accountId, SessionTypeEnum.P2P, netCallAttachment);
|
||||
// ChatRepo.sendMessage(message, true, null);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
@@ -2,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;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main;
|
||||
package com.hbl.lewan.main;
|
||||
|
||||
|
||||
import static com.luck.picture.lib.utils.DensityUtil.getNavigationBarHeight;
|
||||
@@ -57,54 +57,55 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
|
||||
import com.codersun.fingerprintcompat.FingerManager;
|
||||
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
|
||||
import com.dskj.rbchat.AppSkinConfig;
|
||||
import com.dskj.rbchat.CustomConfig;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.NotificationMsgService;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.ActivityMainBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
|
||||
import com.dskj.rbchat.dialog.PayCashDialog;
|
||||
import com.dskj.rbchat.dialog.PayCashFingerDialog;
|
||||
import com.dskj.rbchat.dialog.VersionDialog;
|
||||
import com.dskj.rbchat.game.JsBridgeActivity;
|
||||
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
|
||||
import com.dskj.rbchat.main.chat.ChatConversationFragment;
|
||||
import com.dskj.rbchat.main.chat.ChatTabFragment;
|
||||
import com.dskj.rbchat.main.home.HomeFragment;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.main.mine.MineFragment;
|
||||
import com.dskj.rbchat.main.mine.setting.SettingNotifyViewModel;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.ConfigBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.MessagefcmBean;
|
||||
import com.dskj.rbchat.model.UserShareBean;
|
||||
import com.dskj.rbchat.model.VersionBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
|
||||
import com.dskj.rbchat.pay.PaymentActivity;
|
||||
import com.dskj.rbchat.pay.PaymentActivity1;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.CommonUtils;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.QRCodeScheme;
|
||||
import com.dskj.rbchat.utils.ShareDateUtils;
|
||||
import com.dskj.rbchat.utils.ToolKits;
|
||||
import com.dskj.rbchat.voom.VoomFragment;
|
||||
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
|
||||
import com.dskj.rbchat.welcome.WelcomeActivity;
|
||||
import com.hbl.lewan.AppSkinConfig;
|
||||
import com.hbl.lewan.CustomConfig;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.NotificationMsgService;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.ActivityMainBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog1;
|
||||
import com.hbl.lewan.dialog.PayCashDialog;
|
||||
import com.hbl.lewan.dialog.PayCashFingerDialog;
|
||||
import com.hbl.lewan.dialog.VersionDialog;
|
||||
import com.hbl.lewan.game.JsBridgeActivity;
|
||||
import com.hbl.lewan.main.authorize.AuthorizeActivity;
|
||||
import com.hbl.lewan.main.chat.ChatConversationFragment;
|
||||
import com.hbl.lewan.main.chat.ChatTabFragment;
|
||||
import com.hbl.lewan.main.home.HomeFragment;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.main.mine.MineFragment;
|
||||
import com.hbl.lewan.main.mine.setting.SettingNotifyViewModel;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.ConfigBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.MessagefcmBean;
|
||||
import com.hbl.lewan.model.UserShareBean;
|
||||
import com.hbl.lewan.model.VersionBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
|
||||
import com.hbl.lewan.pay.PaymentActivity;
|
||||
import com.hbl.lewan.pay.PaymentActivity1;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.CommonUtils;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.QRCodeScheme;
|
||||
import com.hbl.lewan.utils.ShareDateUtils;
|
||||
import com.hbl.lewan.utils.ToolKits;
|
||||
import com.hbl.lewan.voom.VoomFragment;
|
||||
import com.hbl.lewan.wallet.SetPayPasswordActivity;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.huawei.hms.hmsscankit.ScanUtilNew;
|
||||
@@ -112,15 +113,15 @@ import com.huawei.hms.ml.scan.HmsScan;
|
||||
import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
|
||||
import com.king.app.updater.AppUpdater;
|
||||
import com.king.zxing.util.CodeUtils;
|
||||
import com.netease.lava.nertc.sdk.NERtcOption;
|
||||
//import com.netease.lava.nertc.sdk.NERtcOption;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.Observer;
|
||||
import com.netease.nimlib.sdk.RequestCallback;
|
||||
import com.netease.nimlib.sdk.ResponseCode;
|
||||
import com.netease.nimlib.sdk.StatusCode;
|
||||
import com.netease.nimlib.sdk.auth.AuthServiceObserver;
|
||||
import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
|
||||
import com.netease.nimlib.sdk.avsignalling.model.SignallingPushConfig;
|
||||
//import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
|
||||
//import com.netease.nimlib.sdk.avsignalling.model.SignallingPushConfig;
|
||||
import com.netease.nimlib.sdk.mixpush.MixPushService;
|
||||
import com.netease.nimlib.sdk.msg.MessageBuilder;
|
||||
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
|
||||
@@ -161,15 +162,15 @@ import com.netease.yunxin.kit.corekit.im.provider.FriendProvider;
|
||||
import com.netease.yunxin.kit.corekit.im.repo.SettingRepo;
|
||||
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
|
||||
import com.netease.yunxin.kit.corekit.route.XKitRouter;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.bean.InvitedInfo;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
|
||||
import com.netease.yunxin.nertc.nertcvideocall.model.PushConfigProvider;
|
||||
import com.netease.yunxin.nertc.ui.CallKitNotificationConfig;
|
||||
import com.netease.yunxin.nertc.ui.CallKitUI;
|
||||
import com.netease.yunxin.nertc.ui.CallKitUIOptions;
|
||||
import com.netease.yunxin.nertc.ui.base.AVChatSoundPlayer;
|
||||
import com.netease.yunxin.nertc.ui.base.SoundHelper;
|
||||
import com.netease.yunxin.nertc.ui.base.UserInfoHelper;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.bean.InvitedInfo;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
|
||||
//import com.netease.yunxin.nertc.nertcvideocall.model.PushConfigProvider;
|
||||
//import com.netease.yunxin.nertc.ui.CallKitNotificationConfig;
|
||||
//import com.netease.yunxin.nertc.ui.CallKitUI;
|
||||
//import com.netease.yunxin.nertc.ui.CallKitUIOptions;
|
||||
//import com.netease.yunxin.nertc.ui.base.AVChatSoundPlayer;
|
||||
//import com.netease.yunxin.nertc.ui.base.SoundHelper;
|
||||
//import com.netease.yunxin.nertc.ui.base.UserInfoHelper;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
@@ -182,7 +183,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
import cn.jpush.android.api.JPushInterface;
|
||||
//import cn.jpush.android.api.JPushInterface;
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
import kotlin.Unit;
|
||||
@@ -337,7 +338,7 @@ public class MainActivity extends BaseActivity {
|
||||
}
|
||||
}
|
||||
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, channelID)
|
||||
.setSmallIcon(R.mipmap.ic_launcher)
|
||||
.setSmallIcon(R.mipmap.ic_launche)
|
||||
.setContentTitle(title)
|
||||
.setContentText(content)
|
||||
.setContentIntent(pendingIntent)
|
||||
@@ -359,7 +360,7 @@ public class MainActivity extends BaseActivity {
|
||||
}
|
||||
LogUtils.d("channelID==" + channelID);
|
||||
int rawResource = MainActivity.this.getResources().getIdentifier(channelID, "raw", getPackageName());
|
||||
Uri ringUri = Uri.parse("android.resource://com.dskj.rbchat/raw/" + rawResource);
|
||||
Uri ringUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + rawResource);
|
||||
NotificationChannel vibration = new NotificationChannel(channelID, IMApplication.getAppContext().getString(R.string.bell_default), NotificationManager.IMPORTANCE_DEFAULT);
|
||||
vibration.enableLights(true);
|
||||
vibration.enableVibration(true);
|
||||
@@ -497,7 +498,7 @@ public class MainActivity extends BaseActivity {
|
||||
|
||||
private void getVersion() {
|
||||
try {
|
||||
Api.getInstance().version(7, DataUtils.getVersionCode(MainActivity.this), IMUIKitConfig.SUBSTATIONID)
|
||||
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(MainActivity.this), IMUIKitConfig.SUBSTATIONID)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@@ -510,7 +511,8 @@ public class MainActivity extends BaseActivity {
|
||||
VersionDialog actionDialog = new VersionDialog(MainActivity.this,
|
||||
String.format(getString(R.string.updateversion_txt), versionBean.getVersionName()),
|
||||
getDownloadText(versionBean), getString(R.string.xiacigengxin_txt),
|
||||
getString(R.string.login_form_have_latest_version_update_now), versionBean.getForceDownload() == 0);
|
||||
getString(R.string.login_form_have_latest_version_update_now),
|
||||
versionBean.getForceDownload() == 0);
|
||||
actionDialog.setOnToActionListener(new VersionDialog.OnToActionListener() {
|
||||
@Override
|
||||
public void toSumbit() {
|
||||
@@ -546,6 +548,9 @@ public class MainActivity extends BaseActivity {
|
||||
|
||||
private void checkUpdate(String url) {
|
||||
new AppUpdater(MainActivity.this, url).start();
|
||||
// Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
// intent.setData(Uri.parse(url));
|
||||
// startActivity(intent);
|
||||
}
|
||||
|
||||
private String getDownloadText(VersionBean versionBean) {
|
||||
@@ -670,7 +675,7 @@ public class MainActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
private void setAlias() {
|
||||
JPushInterface.setAlias(MainActivity.this, Integer.parseInt(IMKitClient.account()), IMKitClient.account());
|
||||
// JPushInterface.setAlias(MainActivity.this, Integer.parseInt(IMKitClient.account()), IMKitClient.account());
|
||||
}
|
||||
|
||||
public void setUnReadChat(int number) {
|
||||
@@ -731,9 +736,9 @@ public class MainActivity extends BaseActivity {
|
||||
protected void onPostResume() {
|
||||
super.onPostResume();
|
||||
// 部分Android机型在页面进入onResume前启动其他页面会取消当前页面流程，避免组件初始化后立即展示来电页面将初始化的逻辑滞后
|
||||
if (!CallKitUI.INSTANCE.getInit()) {
|
||||
configCallKit();
|
||||
}
|
||||
// if (!CallKitUI.INSTANCE.getInit()) {
|
||||
// configCallKit();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
@@ -767,13 +772,18 @@ public class MainActivity extends BaseActivity {
|
||||
ALog.d(Constant.PROJECT_TAG, "MainActivity:initView");
|
||||
loadConfig();
|
||||
List<Fragment> fragments = new ArrayList<>();
|
||||
// index2Fragment = new HomeFragment();
|
||||
index2Fragment = new HomeFragment();
|
||||
chatTabFragment = new ChatTabFragment();
|
||||
// voomFragment = new VoomFragment();
|
||||
voomFragment = new VoomFragment();
|
||||
walletFragment = new MineFragment();
|
||||
// fragments.add(index2Fragment);
|
||||
fragments.add(index2Fragment);
|
||||
fragments.add(chatTabFragment);
|
||||
// fragments.add(voomFragment);
|
||||
if(ApiService.AREA_CODE.equals("+86")) {
|
||||
fragments.add(voomFragment);
|
||||
activityMainBinding.liveBtnGroup.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
activityMainBinding.liveBtnGroup.setVisibility(View.GONE);
|
||||
}
|
||||
fragments.add(walletFragment);
|
||||
|
||||
fragmentAdapter = new FragmentAdapter(this);
|
||||
@@ -782,7 +792,7 @@ public class MainActivity extends BaseActivity {
|
||||
activityMainBinding.viewPager.setAdapter(fragmentAdapter);
|
||||
activityMainBinding.viewPager.setCurrentItem(START_INDEX, false);
|
||||
activityMainBinding.viewPager.setOffscreenPageLimit(fragments.size());
|
||||
mCurrentTab = activityMainBinding.contactBtnGroup;
|
||||
mCurrentTab = activityMainBinding.conversationBtnGroup;
|
||||
resetTabSkin(isCommonSkin);
|
||||
checkZhiWen();
|
||||
shareDateUtils = new ShareDateUtils();
|
||||
@@ -843,7 +853,7 @@ public class MainActivity extends BaseActivity {
|
||||
/**
|
||||
* 解析2维码扫码结果并进入相应和业务逻辑处理（主要用于从2维码扫描界面扫描完成后的回调结果处理）。
|
||||
*
|
||||
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_chat://add_user/400069"
|
||||
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_mm://add_user/400069"
|
||||
*/
|
||||
public void processQRCodeScanResult(Activity activity, String originalQrcodeStr) {
|
||||
if (originalQrcodeStr != null) {
|
||||
@@ -888,7 +898,7 @@ public class MainActivity extends BaseActivity {
|
||||
startActivity(intent2);
|
||||
} else {
|
||||
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
|
||||
// 2维码内容前缀（形如“time_go_chat://add_user/”）
|
||||
// 2维码内容前缀（形如“time_go_mm://add_user/”）
|
||||
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
|
||||
|
||||
String scheme = qrData.getScheme();
|
||||
@@ -963,7 +973,7 @@ public class MainActivity extends BaseActivity {
|
||||
break;
|
||||
default:
|
||||
if (scheme.startsWith("http")) {
|
||||
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
|
||||
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
|
||||
sendMachine(scheme);
|
||||
} else {
|
||||
// showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
|
||||
@@ -1538,7 +1548,7 @@ public class MainActivity extends BaseActivity {
|
||||
@SuppressLint("UseCompatLoadingForDrawables")
|
||||
private void resetTabSkin(boolean isCommonSkin) {
|
||||
if (mCurrentTab == activityMainBinding.contactBtnGroup) {
|
||||
activityMainBinding.viewPager.setCurrentItem(0, false);
|
||||
activityMainBinding.viewPager.setCurrentItem(1, false);
|
||||
activityMainBinding.contact.setTextColor(
|
||||
getResources().getColor(R.color.color_fe6881));
|
||||
activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
|
||||
@@ -1552,7 +1562,11 @@ public class MainActivity extends BaseActivity {
|
||||
null, getResources().getDrawable(R.mipmap.voom_img_t), null, null);
|
||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
|
||||
} else if (mCurrentTab == activityMainBinding.myselfBtnGroup) {
|
||||
activityMainBinding.viewPager.setCurrentItem(1, false);
|
||||
// if(ApiService.AREA_CODE.equals("+86")) {
|
||||
activityMainBinding.viewPager.setCurrentItem(3, false);
|
||||
// }else{
|
||||
// activityMainBinding.viewPager.setCurrentItem(1, false);
|
||||
// }
|
||||
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
|
||||
activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
|
||||
null, getResources().getDrawable(R.mipmap.wo_t), null, null);
|
||||
@@ -1718,129 +1732,129 @@ public class MainActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
|
||||
private void configCallKit() {
|
||||
CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() {
|
||||
@Override
|
||||
public boolean isEnable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) {
|
||||
int resId;
|
||||
if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) {
|
||||
resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring;
|
||||
} else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) {
|
||||
resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName());
|
||||
} else {
|
||||
//結束
|
||||
resId = R.raw.nosound;
|
||||
}
|
||||
return resId;
|
||||
}
|
||||
}).rtcAppKey(DataUtils.readAppKey(this))
|
||||
.currentUserAccId(IMKitClient.account())
|
||||
.userInfoHelper(new UserInfoHelper() {
|
||||
@Override
|
||||
public boolean fetchNickname(@NonNull String s, @NonNull Function1<? super String, Unit> function1) {
|
||||
LogUtils.d("s===" + s + function1);
|
||||
FriendInfo friendInfo = ContactRepo.getFriend(s);
|
||||
if (friendInfo != null) {
|
||||
function1.invoke(friendInfo.getName());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1<? super String, Unit> function1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) {
|
||||
return false;
|
||||
}
|
||||
})
|
||||
.timeOutMillisecond(30 * 1000L)
|
||||
.pushConfigProvider(new PushConfigProvider() {
|
||||
@Override
|
||||
public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) {
|
||||
return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
? getString(R.string.incoming_call_notify_audio)
|
||||
: getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
? getString(R.string.incoming_call_notify_audio)
|
||||
: getString(R.string.incoming_call_notify_video)),
|
||||
setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId))
|
||||
);
|
||||
}
|
||||
})
|
||||
// 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true
|
||||
.resumeBGInvitation(true)
|
||||
.notificationConfigFetcher(new Function1<InvitedInfo, CallKitNotificationConfig>() {
|
||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||
@Override
|
||||
public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) {
|
||||
UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId);
|
||||
String content =
|
||||
(info != null ? info.getUserInfoName() : invitedInfo.currentAccId)
|
||||
+ (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
? getString(R.string.incoming_call_notify_audio)
|
||||
: getString(R.string.incoming_call_notify_video));
|
||||
String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
|
||||
LogUtils.d("NotificationConfig callName==" + callName);
|
||||
int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
|
||||
Uri musicUri = Uri.parse("android.resource://com.dskj.rbchat/raw/" + callName);
|
||||
return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
|
||||
}
|
||||
})
|
||||
// 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置)
|
||||
//.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法
|
||||
// 设置初始化 rtc sdk 相关配置，按照所需进行配置
|
||||
.rtcSdkOption(new NERtcOption())
|
||||
// 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
|
||||
// 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false
|
||||
.rtcInitScope(false)
|
||||
.build();
|
||||
// 设置自定义话单消息发送
|
||||
NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper());
|
||||
// // 若重复初始化会销毁之前的初始化实例，重新初始化
|
||||
CallKitUI.init(getApplicationContext(), options);
|
||||
|
||||
NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
|
||||
@Override
|
||||
public void onEvent(StatusCode statusCode) {
|
||||
if (statusCode == StatusCode.LOGOUT) {
|
||||
CallKitUI.destroy();
|
||||
} else if (statusCode.wontAutoLogin()) {
|
||||
if (!isFinishing()) {
|
||||
ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false);
|
||||
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() {
|
||||
@Override
|
||||
public void toSumbit() {
|
||||
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
|
||||
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
|
||||
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
|
||||
CallKitUI.destroy();
|
||||
finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toCancel() {
|
||||
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
|
||||
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
|
||||
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
|
||||
CallKitUI.destroy();
|
||||
finish();
|
||||
}
|
||||
});
|
||||
actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp);
|
||||
actionConfirmDialog.show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
// private void configCallKit() {
|
||||
// CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() {
|
||||
// @Override
|
||||
// public boolean isEnable() {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Nullable
|
||||
// @Override
|
||||
// public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) {
|
||||
// int resId;
|
||||
// if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) {
|
||||
// resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring;
|
||||
// } else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) {
|
||||
// resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName());
|
||||
// } else {
|
||||
// //結束
|
||||
// resId = R.raw.nosound;
|
||||
// }
|
||||
// return resId;
|
||||
// }
|
||||
// }).rtcAppKey(DataUtils.readAppKey(this))
|
||||
// .currentUserAccId(IMKitClient.account())
|
||||
// .userInfoHelper(new UserInfoHelper() {
|
||||
// @Override
|
||||
// public boolean fetchNickname(@NonNull String s, @NonNull Function1<? super String, Unit> function1) {
|
||||
// LogUtils.d("s===" + s + function1);
|
||||
// FriendInfo friendInfo = ContactRepo.getFriend(s);
|
||||
// if (friendInfo != null) {
|
||||
// function1.invoke(friendInfo.getName());
|
||||
// }
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1<? super String, Unit> function1) {
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) {
|
||||
// return false;
|
||||
// }
|
||||
// })
|
||||
// .timeOutMillisecond(30 * 1000L)
|
||||
// .pushConfigProvider(new PushConfigProvider() {
|
||||
// @Override
|
||||
// public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) {
|
||||
// return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
// ? getString(R.string.incoming_call_notify_audio)
|
||||
// : getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
// ? getString(R.string.incoming_call_notify_audio)
|
||||
// : getString(R.string.incoming_call_notify_video)),
|
||||
// setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId))
|
||||
// );
|
||||
// }
|
||||
// })
|
||||
// // 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true
|
||||
// .resumeBGInvitation(true)
|
||||
// .notificationConfigFetcher(new Function1<InvitedInfo, CallKitNotificationConfig>() {
|
||||
// @RequiresApi(api = Build.VERSION_CODES.O)
|
||||
// @Override
|
||||
// public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) {
|
||||
// UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId);
|
||||
// String content =
|
||||
// (info != null ? info.getUserInfoName() : invitedInfo.currentAccId)
|
||||
// + (invitedInfo.channelType == ChannelType.AUDIO.getValue()
|
||||
// ? getString(R.string.incoming_call_notify_audio)
|
||||
// : getString(R.string.incoming_call_notify_video));
|
||||
// String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
|
||||
// LogUtils.d("NotificationConfig callName==" + callName);
|
||||
// int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
|
||||
// Uri musicUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + callName);
|
||||
// return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
|
||||
// }
|
||||
// })
|
||||
// // 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置)
|
||||
// //.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法
|
||||
// // 设置初始化 rtc sdk 相关配置，按照所需进行配置
|
||||
// .rtcSdkOption(new NERtcOption())
|
||||
// // 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
|
||||
// // 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false
|
||||
// .rtcInitScope(false)
|
||||
// .build();
|
||||
// // 设置自定义话单消息发送
|
||||
// NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper());
|
||||
//// // 若重复初始化会销毁之前的初始化实例，重新初始化
|
||||
// CallKitUI.init(getApplicationContext(), options);
|
||||
//
|
||||
// NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
|
||||
// @Override
|
||||
// public void onEvent(StatusCode statusCode) {
|
||||
// if (statusCode == StatusCode.LOGOUT) {
|
||||
// CallKitUI.destroy();
|
||||
// } else if (statusCode.wontAutoLogin()) {
|
||||
// if (!isFinishing()) {
|
||||
// ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false);
|
||||
// actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() {
|
||||
// @Override
|
||||
// public void toSumbit() {
|
||||
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
|
||||
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
|
||||
// startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
|
||||
// CallKitUI.destroy();
|
||||
// finish();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void toCancel() {
|
||||
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
|
||||
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
|
||||
// startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
|
||||
// CallKitUI.destroy();
|
||||
// finish();
|
||||
// }
|
||||
// });
|
||||
// actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp);
|
||||
// actionConfirmDialog.show();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }, true);
|
||||
// }
|
||||
|
||||
public Map<String, Object> setPushPload(UserInfo userInfo) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
@@ -2176,7 +2190,7 @@ public class MainActivity extends BaseActivity {
|
||||
private EditText commentEtShare;
|
||||
private TextView shareBt;
|
||||
private LinearLayoutManager linearLayoutManager;
|
||||
private com.dskj.rbchat.adapter.CommonAdapter commonAdapter;
|
||||
private com.hbl.lewan.adapter.CommonAdapter commonAdapter;
|
||||
private ArrayList<UserShareBean> titleUsers;
|
||||
private ArrayList<Boolean> titleUsersIsCheck;
|
||||
|
||||
@@ -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();
|
||||
@@ -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;
|
||||
@@ -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<Long> teams = new ArrayList<>();
|
||||
for (String groupId : groupIds) {
|
||||
// teammodel
|
||||
// .getTeamWithMemberData()
|
||||
// .observe(
|
||||
// this,
|
||||
// teamResultInfo -> {
|
||||
// if (teamResultInfo.getValue() == null || !teamResultInfo.getSuccess()) {
|
||||
// return;
|
||||
// }
|
||||
// Team team = teamResultInfo.getValue().getTeam();
|
||||
// addShiJieConversation(team);
|
||||
// });
|
||||
// teammodel.requestTeamData(groupId);
|
||||
NIMClient.getService(TeamService.class).searchTeam(groupId).setCallback(new RequestCallback<Team>() {
|
||||
@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<TeamInfoResult>() {
|
||||
@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<Team> 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);
|
||||
}
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
|
||||
//通讯录
|
||||
@@ -2,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 -> {
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main.home;
|
||||
package com.hbl.lewan.main.home;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@@ -21,38 +21,38 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.core.text.HtmlCompat;
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.FragmentHomeNewBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.game.JsBridgeActivity;
|
||||
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.main.index.AiChatActivity;
|
||||
import com.dskj.rbchat.main.message.NotifyMessageActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.AdBean;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.MessageBean;
|
||||
import com.dskj.rbchat.model.NotifyCountBean;
|
||||
import com.dskj.rbchat.model.StaffServiceIdBean;
|
||||
import com.dskj.rbchat.model.UserRankBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.ImageLoader;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.wallet.GiftInfoActivity;
|
||||
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
|
||||
import com.dskj.rbchat.wallet.TopUpActivity;
|
||||
import com.dskj.rbchat.wallet.WalletInfoActivity;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.FragmentHomeNewBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.game.JsBridgeActivity;
|
||||
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
//import com.hbl.lewan.main.index.AiChatActivity;
|
||||
import com.hbl.lewan.main.message.NotifyMessageActivity;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.AdBean;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.MessageBean;
|
||||
import com.hbl.lewan.model.NotifyCountBean;
|
||||
import com.hbl.lewan.model.StaffServiceIdBean;
|
||||
import com.hbl.lewan.model.UserRankBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.ImageLoader;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.wallet.GiftInfoActivity;
|
||||
import com.hbl.lewan.wallet.SetPayPasswordActivity;
|
||||
import com.hbl.lewan.wallet.TopUpActivity;
|
||||
import com.hbl.lewan.wallet.WalletInfoActivity;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.Observer;
|
||||
import com.netease.nimlib.sdk.friend.model.AddFriendNotify;
|
||||
@@ -72,7 +72,7 @@ import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
|
||||
import com.netease.yunxin.kit.corekit.im.repo.SettingRepo;
|
||||
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
|
||||
import com.netease.yunxin.kit.corekit.route.XKitRouter;
|
||||
import com.youth.banner.BannerConfig;
|
||||
//import com.youth.banner.BannerConfig;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -183,7 +183,7 @@ public class HomeFragment extends BaseFragment {
|
||||
|
||||
binding.layoutIndexfmAichat.setOnClickListener(view -> {
|
||||
//launcher
|
||||
startActivity(new Intent(getActivity(), AiChatActivity.class));
|
||||
// startActivity(new Intent(getActivity(), AiChatActivity.class));
|
||||
});
|
||||
binding.userLayout.setOnClickListener(v -> startUserInfoActivity(IMKitClient.account()));
|
||||
|
||||
@@ -198,21 +198,21 @@ public class HomeFragment extends BaseFragment {
|
||||
adList();
|
||||
initObserver();
|
||||
|
||||
binding.recordLottieView.setOnClickListener(v -> {
|
||||
if (binding.robitRy.getVisibility() == View.GONE) {
|
||||
binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
|
||||
animateIn();
|
||||
} else {
|
||||
binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
|
||||
animateOut();
|
||||
}
|
||||
});
|
||||
binding.robitRy.setOnClickListener(v -> {
|
||||
|
||||
});
|
||||
AnimationDrawable mLoadingAnimationDrawable = (AnimationDrawable) binding.recordLottieView.getDrawable();
|
||||
//直接就开始执行，性能不是最佳的。
|
||||
mLoadingAnimationDrawable.start();
|
||||
// binding.recordLottieView.setOnClickListener(v -> {
|
||||
// if (binding.robitRy.getVisibility() == View.GONE) {
|
||||
// binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
|
||||
// animateIn();
|
||||
// } else {
|
||||
// binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
|
||||
// animateOut();
|
||||
// }
|
||||
// });
|
||||
// binding.robitRy.setOnClickListener(v -> {
|
||||
//
|
||||
// });
|
||||
// AnimationDrawable mLoadingAnimationDrawable = (AnimationDrawable) binding.recordLottieView.getDrawable();
|
||||
// //直接就开始执行，性能不是最佳的。
|
||||
// mLoadingAnimationDrawable.start();
|
||||
|
||||
}
|
||||
|
||||
@@ -275,25 +275,25 @@ public class HomeFragment extends BaseFragment {
|
||||
|
||||
private void initBanner() {
|
||||
|
||||
binding.banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
|
||||
//设置图片加载器，图片加载器在下方
|
||||
binding.banner.setImageLoader(new MyLoader());
|
||||
//设置图片网址或地址的集合
|
||||
binding.banner.setImages(list_path1);
|
||||
//设置轮播的动画效果，内含多种特效，可点入方法内查找后内逐一体验
|
||||
binding.banner.setBannerAnimation(com.youth.banner.Transformer.Default);
|
||||
//设置轮播图的标题集合
|
||||
binding.banner.setBannerTitles(list_title1);
|
||||
//设置轮播间隔时间
|
||||
binding.banner.setDelayTime(3000);
|
||||
//设置是否为自动轮播，默认是“是”。
|
||||
binding.banner.isAutoPlay(true);
|
||||
//设置指示器的位置，小点点，左中右。
|
||||
binding.banner.setIndicatorGravity(BannerConfig.CENTER)
|
||||
//以上内容都可写成链式布局，这是轮播图的监听。比较重要。方法在下面。
|
||||
.setOnBannerListener(position1 -> toAdClick(binding.banner.getContext(), list_path1.get(position1)))
|
||||
//必须最后调用的方法，启动轮播图。
|
||||
.start();
|
||||
// binding.banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
|
||||
// //设置图片加载器，图片加载器在下方
|
||||
// binding.banner.setImageLoader(new MyLoader());
|
||||
// //设置图片网址或地址的集合
|
||||
// binding.banner.setImages(list_path1);
|
||||
// //设置轮播的动画效果，内含多种特效，可点入方法内查找后内逐一体验
|
||||
// binding.banner.setBannerAnimation(com.youth.banner.Transformer.Default);
|
||||
// //设置轮播图的标题集合
|
||||
// binding.banner.setBannerTitles(list_title1);
|
||||
// //设置轮播间隔时间
|
||||
// binding.banner.setDelayTime(3000);
|
||||
// //设置是否为自动轮播，默认是“是”。
|
||||
// binding.banner.isAutoPlay(true);
|
||||
// //设置指示器的位置，小点点，左中右。
|
||||
// binding.banner.setIndicatorGravity(BannerConfig.CENTER)
|
||||
// //以上内容都可写成链式布局，这是轮播图的监听。比较重要。方法在下面。
|
||||
// .setOnBannerListener(position1 -> toAdClick(binding.banner.getContext(), list_path1.get(position1)))
|
||||
// //必须最后调用的方法，启动轮播图。
|
||||
// .start();
|
||||
}
|
||||
|
||||
private void toAdClick(Context context, AdBean s) {
|
||||
@@ -301,14 +301,14 @@ public class HomeFragment extends BaseFragment {
|
||||
activity.toGame(s.getJumpUrl());
|
||||
}
|
||||
|
||||
//自定义的图片加载器
|
||||
private class MyLoader extends com.youth.banner.loader.ImageLoader {
|
||||
@Override
|
||||
public void displayImage(Context context, Object path, ImageView imageView) {
|
||||
ImageLoader.loadCenterCropBanner(getActivity(), (AdBean) path, imageView, R.mipmap.ad2, R.mipmap.ad2);
|
||||
|
||||
}
|
||||
}
|
||||
// //自定义的图片加载器
|
||||
// private class MyLoader extends com.youth.banner.loader.ImageLoader {
|
||||
// @Override
|
||||
// public void displayImage(Context context, Object path, ImageView imageView) {
|
||||
// ImageLoader.loadCenterCropBanner(getActivity(), (AdBean) path, imageView, R.mipmap.ad2, R.mipmap.ad2);
|
||||
//
|
||||
// }
|
||||
// }
|
||||
|
||||
public void startUserInfoActivity(String userid) {
|
||||
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
|
||||
390
app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java
Normal file
390
app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java
Normal file
@@ -0,0 +1,390 @@
|
||||
//package com.hbl.lewan.main.index;
|
||||
//
|
||||
//import static android.widget.RelativeLayout.ALIGN_PARENT_END;
|
||||
//import static android.widget.RelativeLayout.ALIGN_PARENT_START;
|
||||
//
|
||||
//import android.content.Context;
|
||||
//import android.content.Intent;
|
||||
//import android.content.SharedPreferences;
|
||||
//import android.os.Bundle;
|
||||
//import android.text.TextUtils;
|
||||
//import android.util.JsonWriter;
|
||||
//import android.util.Log;
|
||||
//import android.view.View;
|
||||
//import android.view.ViewGroup;
|
||||
//import android.view.inputmethod.EditorInfo;
|
||||
//import android.widget.RelativeLayout;
|
||||
//import android.widget.TextView;
|
||||
//
|
||||
//import androidx.annotation.Nullable;
|
||||
//import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
//
|
||||
//import com.bumptech.glide.Glide;
|
||||
//import com.hbl.lewan.IMApplication;
|
||||
//import com.hbl.lewan.R;
|
||||
//import com.hbl.lewan.adapter.CommonAdapter;
|
||||
//import com.hbl.lewan.adapter.ViewHolder;
|
||||
//import com.hbl.lewan.base.LllChatBaseActivity;
|
||||
//import com.hbl.lewan.databinding.ActivityAichatBinding;
|
||||
//import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
//import com.hbl.lewan.model.AiConvertBean;
|
||||
//import com.hbl.lewan.model.AiMessageBean;
|
||||
//import com.hbl.lewan.network.Api;
|
||||
//import com.hbl.lewan.network.BaseObserver;
|
||||
//import com.hbl.lewan.network.Result;
|
||||
//import com.hbl.lewan.pay.CollectionActivity;
|
||||
//import com.hbl.lewan.utils.FileUtils;
|
||||
//import com.hbl.lewan.utils.GsonUtils;
|
||||
//import com.hbl.lewan.utils.KeyboardUtil;
|
||||
//import com.hbl.lewan.utils.LogUtils;
|
||||
//import com.hbl.lewan.utils.ShareDateUtils;
|
||||
//import com.google.android.gms.common.util.JsonUtils;
|
||||
//import com.google.android.gms.common.util.SharedPreferencesUtils;
|
||||
//import com.google.gson.JsonParser;
|
||||
//import com.iflytek.sparkchain.core.LLM;
|
||||
//import com.iflytek.sparkchain.core.LLMCallbacks;
|
||||
//import com.iflytek.sparkchain.core.LLMError;
|
||||
//import com.iflytek.sparkchain.core.LLMEvent;
|
||||
//import com.iflytek.sparkchain.core.LLMResult;
|
||||
//import com.netease.nimlib.sdk.NIMClient;
|
||||
//import com.netease.nimlib.sdk.msg.MsgService;
|
||||
//import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
|
||||
//import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
|
||||
//import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
//
|
||||
//import org.json.JSONArray;
|
||||
//import org.json.JSONException;
|
||||
//import org.json.JSONObject;
|
||||
//import org.w3c.dom.Document;
|
||||
//import org.w3c.dom.Element;
|
||||
//import org.w3c.dom.Node;
|
||||
//import org.w3c.dom.NodeList;
|
||||
//
|
||||
//import java.io.BufferedReader;
|
||||
//import java.io.BufferedWriter;
|
||||
//import java.io.File;
|
||||
//import java.io.FileNotFoundException;
|
||||
//import java.io.FileOutputStream;
|
||||
//import java.io.FileReader;
|
||||
//import java.io.FileWriter;
|
||||
//import java.io.IOException;
|
||||
//import java.util.ArrayList;
|
||||
//import java.util.List;
|
||||
//import java.util.Map;
|
||||
//
|
||||
//import javax.xml.parsers.DocumentBuilder;
|
||||
//import javax.xml.parsers.DocumentBuilderFactory;
|
||||
//import javax.xml.transform.OutputKeys;
|
||||
//import javax.xml.transform.Transformer;
|
||||
//import javax.xml.transform.TransformerFactory;
|
||||
//import javax.xml.transform.dom.DOMSource;
|
||||
//import javax.xml.transform.stream.StreamResult;
|
||||
//
|
||||
//import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
//import io.reactivex.schedulers.Schedulers;
|
||||
//
|
||||
//public class AiChatActivity extends LllChatBaseActivity {
|
||||
//
|
||||
// ActivityAichatBinding binding;
|
||||
// public LLM llm;
|
||||
// public CommonAdapter commonAdapter;
|
||||
// private StringBuilder stringBuilderContent = new StringBuilder();
|
||||
// private ArrayList<AiMessageBean> chatMessageBeans = new ArrayList<>();
|
||||
// private boolean isAichat = false;
|
||||
//
|
||||
//
|
||||
// @Override
|
||||
// protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
// super.onCreate(savedInstanceState);
|
||||
// binding = ActivityAichatBinding.inflate(getLayoutInflater());
|
||||
// setContentView(binding.getRoot());
|
||||
// llm = IMApplication.getInstance().llm;
|
||||
// if (llm != null) {
|
||||
// llm.registerLLMCallbacks(new LLMCallbacks() {
|
||||
// @Override
|
||||
// public void onLLMResult(LLMResult llmResult, Object o) {
|
||||
// stringBuilderContent.append(llmResult.getContent());
|
||||
// int status = llmResult.getStatus(); //status 为2
|
||||
// if (status == 2) {
|
||||
// AiChatEnd();
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onLLMEvent(LLMEvent llmEvent, Object o) {
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onLLMError(LLMError llmError, Object o) {
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// initView();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int initNavigationBarColor() {
|
||||
// return 0;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int initStatusBarColor() {
|
||||
// return 0;
|
||||
// }
|
||||
//
|
||||
// public void AiChatEnd() {
|
||||
// //結束了對話
|
||||
//// dismissLoading();
|
||||
// if (!TextUtils.isEmpty(stringBuilderContent.toString())) {
|
||||
// runOnUiThread(() -> {
|
||||
//// AiMessageBean bean = new AiMessageBean(replaceContent(stringBuilderContent.toString()), true);
|
||||
// int size = commonAdapter.getDates().size();
|
||||
// AiMessageBean bean = (AiMessageBean) commonAdapter.getDates().get(size - 1);
|
||||
// if (!bean.isAi()) {
|
||||
// String value = replaceContent(stringBuilderContent.toString());
|
||||
// convertContent(value, new CallbackListener() {
|
||||
// @Override
|
||||
// public void setResult(String value) {
|
||||
// AiMessageBean bean = new AiMessageBean(value, true);
|
||||
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
// }
|
||||
// });
|
||||
// } else {
|
||||
// String value = replaceContent(replaceContent(stringBuilderContent.toString()));
|
||||
// AiMessageBean finalBean = bean;
|
||||
// convertContent(value, new CallbackListener() {
|
||||
// @Override
|
||||
// public void setResult(String value) {
|
||||
// finalBean.setMessage(value);
|
||||
// commonAdapter.notifyDataSetChanged();
|
||||
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
// stringBuilderContent.delete(0, stringBuilderContent.toString().length());
|
||||
// scrollbottom();
|
||||
// binding.editInputchat.setFocusable(true);
|
||||
// binding.editInputchat.setFocusableInTouchMode(true);
|
||||
// isAichat = false;
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// }
|
||||
//
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public void scrollbottom() {
|
||||
// int count = commonAdapter.getItemCount();
|
||||
// binding.recyclerChat.post(() -> binding.recyclerChat.scrollToPosition(count > 0 ? count - 1 : 0));
|
||||
// }
|
||||
//
|
||||
// public String replaceContent(String content) {
|
||||
// if (content.contains("您好，我是科大讯飞研发的认知智能大模型，我的名字叫讯飞星火认知大模型。我可以和人类进行自然交流，解答问题，高效完成各领域认知智能需求。")) {
|
||||
// content = getString(R.string.aiintroduct_zh_txt);
|
||||
// return content;
|
||||
// }
|
||||
// if (content.contains("Hello, I am iFLYTEK Spark developed by iFLYTEK, and myHello, I am iFLYTEK Spark developed by iFLYTEK, and my name is iFLYTEK Spark. I can communicate with human beings naturally, answer questions, and efficiently complete the needs of cognitive intelligence in various fields.")) {
|
||||
// content = getString(R.string.aiintroduct_en_txt);
|
||||
// return content;
|
||||
// }
|
||||
// content = content.replace("科大讯飞", "小夢");
|
||||
// content = content.replace("讯飞", "小夢");
|
||||
// content = content.replace("讯飞", "小夢");
|
||||
// content = content.replace("科大", "小夢");
|
||||
// content = content.replace("iFLYTEK Spark", "XiaoMeng");
|
||||
//
|
||||
// return content;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void initView() {
|
||||
// binding.titlebarAichat.setActionTextColor(getResources().getColor(R.color.color_themeblue));
|
||||
// binding.titlebarAichat.setActionText(getString(R.string.aihistory_clean));
|
||||
// binding.titlebarAichat.setActionListener(view -> {
|
||||
// if (!isAichat) {
|
||||
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, getString(R.string.aihistory_title), true);
|
||||
// actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
|
||||
// @Override
|
||||
// public void toSumbit() {
|
||||
// commonAdapter.getDates().clear();
|
||||
// chatMessageBeans.clear();
|
||||
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
// commonAdapter.notifyDataSetChanged();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void toCancel() {
|
||||
//
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// actionConfirmDialog.show();
|
||||
// }
|
||||
//
|
||||
// });
|
||||
// binding.titlebarAichat.setOnBackIconClickListener(view -> onBackPressed());
|
||||
// binding.titlebarAichat.setTitle(getString(R.string.ainame_txt));
|
||||
// binding.editInputchat.setOnEditorActionListener(
|
||||
// (v, actionId, event) -> {
|
||||
// if (actionId == EditorInfo.IME_ACTION_SEND) {
|
||||
// sendText();
|
||||
// }
|
||||
// return true;
|
||||
// });
|
||||
// binding.recyclerChat.setLayoutManager(new LinearLayoutManager(this));
|
||||
// commonAdapter = new CommonAdapter<AiMessageBean>(this, R.layout.item_chatai, chatMessageBeans) {
|
||||
//
|
||||
// private TextView tvContent;
|
||||
//
|
||||
// @Override
|
||||
// public void convert(ViewHolder holder, AiMessageBean s, int index) {
|
||||
// tvContent = holder.getView(R.id.tv_chatcontent);
|
||||
// tvContent.setText(s.message);
|
||||
// RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
// if (s.isAi) {
|
||||
// params.addRule(ALIGN_PARENT_START);
|
||||
// params.setMargins(20, 20, 100, 20);
|
||||
// tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_receive_bg);
|
||||
// tvContent.setTextColor(mContext.getResources().getColor(R.color.color_333333));
|
||||
// } else {
|
||||
// params.addRule(ALIGN_PARENT_END);
|
||||
// params.setMargins(100, 20, 20, 20);
|
||||
// tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_send_bg);
|
||||
// tvContent.setTextColor(mContext.getResources().getColor(android.R.color.black));
|
||||
// }
|
||||
// tvContent.setLayoutParams(params);
|
||||
//
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// String value = FileUtils.getChatData(AiChatActivity.this);
|
||||
// if (!TextUtils.isEmpty(value)) {
|
||||
// List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
|
||||
// LogUtils.i("aimessagebean-" + aiMessageBean.size());
|
||||
// if (aiMessageBean.size() == 0) {
|
||||
// sendHello();
|
||||
// }
|
||||
// chatMessageBeans.addAll(aiMessageBean);
|
||||
// } else {
|
||||
// sendHello();
|
||||
// }
|
||||
// binding.recyclerChat.setAdapter(commonAdapter);
|
||||
// scrollbottom();
|
||||
// }
|
||||
//
|
||||
// public void sendHello() {
|
||||
// AiMessageBean bean = new AiMessageBean(getString(R.string.aihint_txt), true);
|
||||
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
// }
|
||||
//
|
||||
// public void sendText() {
|
||||
// String value = binding.editInputchat.getText().toString();
|
||||
// if (!TextUtils.isEmpty(value)) {
|
||||
// startChat(value);
|
||||
// binding.editInputchat.setFocusable(false);
|
||||
// binding.editInputchat.setFocusableInTouchMode(false);
|
||||
// } else {
|
||||
// isAichat = false;
|
||||
// ToastX.showShortToast("请输入聊天内容");
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private void startChat(String content) {
|
||||
// if (llm == null) {
|
||||
// // Log.e(TAG, "startChat failed,please setLLMConfig before!");
|
||||
// return;
|
||||
// }
|
||||
// isAichat = true;
|
||||
// String usrInputText = content;
|
||||
// //Log.d(TAG, "用户输入：" + usrInputText);
|
||||
//// if (usrInputText.length() >= 1)
|
||||
//// binding.editInputchat.append("\n输入:\n " + usrInputText + "\n");
|
||||
// AiMessageBean bean = new AiMessageBean(content, false);
|
||||
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
|
||||
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
|
||||
// AiMessageBean bean2 = new AiMessageBean(getString(R.string.aianswer_txt), true);
|
||||
// commonAdapter.addItems(commonAdapter.getDates().size(), bean2);
|
||||
// scrollbottom();
|
||||
// KeyboardUtil.hideSoftInput(this);
|
||||
// String myContext = "myContext";
|
||||
// binding.editInputchat.setText("");
|
||||
//
|
||||
//// showLoading();
|
||||
// int ret = llm.arun(usrInputText, myContext);
|
||||
// if (ret != 0) {
|
||||
// dismissLoading();
|
||||
// //Log.e(TAG, "SparkChain failed:\n" + ret);
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private void convertContent(String content, CallbackListener callbackListener) {
|
||||
// Api.getInstance().convertzh(1, content, "nxmfxsiggkcw1pbl", "p7UncBBNfLmq1aoajsHB2qnfiznmiMHs")
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<AiConvertBean> o) {
|
||||
// if (o.code == 1 && o.data != null) {
|
||||
// try {
|
||||
// String result = o.data.getConvertContent();
|
||||
// callbackListener.setResult(result);
|
||||
// } catch (Exception e) {
|
||||
// callbackListener.setResult(content);
|
||||
// }
|
||||
//
|
||||
// } else {
|
||||
// callbackListener.setResult(content);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// callbackListener.setResult(content);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// public interface CallbackListener {
|
||||
// void setResult(String value);
|
||||
// }
|
||||
//// private void writeData() {
|
||||
//// try {
|
||||
////// if (chatMessageBeans.size() > 100) { //只存100条
|
||||
////// chatMessageBeans.remove(0);
|
||||
////// }
|
||||
//// File file = new File(getFilesDir(), chatFileName);
|
||||
//// String jsonString = GsonUtils.beanToJSONString(chatMessageBeans);
|
||||
//// FileWriter fileWriter = new FileWriter(file, false);
|
||||
//// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
|
||||
//// bufferedWriter.write(jsonString);
|
||||
//// bufferedWriter.close();
|
||||
//// } catch (IOException e) {
|
||||
//// LogUtils.i(e.getMessage());
|
||||
//// }
|
||||
////
|
||||
//// }
|
||||
//
|
||||
//
|
||||
//// @Override
|
||||
//// public void onBackPressed() {
|
||||
//// Intent intent = new Intent();
|
||||
//// intent.putExtra("update", isUpdate);
|
||||
//// setResult(RESULT_OK, intent);
|
||||
//// finish();
|
||||
////// super.onBackPressed();
|
||||
//// }
|
||||
//
|
||||
//
|
||||
//}
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -2,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 -> {
|
||||
@@ -2,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 -> {
|
||||
@@ -2,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 -> {
|
||||
@@ -2,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;
|
||||
@@ -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));
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -2,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -2,9 +2,8 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main.mine;
|
||||
package com.hbl.lewan.main.mine;
|
||||
|
||||
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
|
||||
import static com.netease.yunxin.kit.chatkit.ui.common.ChatUserCache.getUserInfo;
|
||||
|
||||
import android.Manifest;
|
||||
@@ -12,23 +11,16 @@ import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Color;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.result.ActivityResultLauncher;
|
||||
@@ -37,42 +29,30 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.RequiresApi;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.dskj.rbchat.AppSkinConfig;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.ActivityHeadUserEditBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityLocUserInfoBinding;
|
||||
import com.dskj.rbchat.login.LoginActivity;
|
||||
import com.dskj.rbchat.login.RegisterActivity;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.model.UserUpdateEvent;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ToolKits;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.king.zxing.util.CodeUtils;
|
||||
import com.hbl.lewan.AppSkinConfig;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityHeadUserEditBinding;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.UserUpdateEvent;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.FileUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
import com.luck.picture.lib.entity.LocalMedia;
|
||||
@@ -81,51 +61,48 @@ import com.luck.picture.lib.style.BottomNavBarStyle;
|
||||
import com.luck.picture.lib.style.PictureSelectorStyle;
|
||||
import com.luck.picture.lib.style.SelectMainStyle;
|
||||
import com.luck.picture.lib.style.TitleBarStyle;
|
||||
import com.netease.nimlib.sdk.msg.MessageBuilder;
|
||||
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
|
||||
import com.netease.nimlib.sdk.msg.model.IMMessage;
|
||||
import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
|
||||
import com.netease.yunxin.kit.common.ui.photo.BasePhotoChoiceDialog;
|
||||
import com.netease.yunxin.kit.common.ui.photo.PhotoChoiceDialog;
|
||||
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
|
||||
import com.netease.yunxin.kit.common.ui.utils.AvatarColor;
|
||||
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;
|
||||
import com.netease.yunxin.kit.common.ui.utils.Permission;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.ui.widgets.datepicker.CustomDatePicker;
|
||||
import com.netease.yunxin.kit.common.ui.widgets.datepicker.DateFormatUtils;
|
||||
import com.netease.yunxin.kit.common.utils.NetworkUtils;
|
||||
import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
import com.netease.yunxin.kit.common.utils.SizeUtils;
|
||||
import com.netease.yunxin.kit.common.utils.UriUtils;
|
||||
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
|
||||
import com.netease.yunxin.kit.corekit.event.EventCenter;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
import com.netease.yunxin.kit.corekit.im.model.UserField;
|
||||
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
|
||||
import com.netease.yunxin.kit.corekit.im.provider.FetchCallbackImpl;
|
||||
import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
|
||||
import com.netease.yunxin.kit.teamkit.ui.fun.dialog.FunPhotoChoiceDialog;
|
||||
import com.qiniu.android.common.FixedZone;
|
||||
import com.qiniu.android.common.Zone;
|
||||
import com.qiniu.android.storage.Configuration;
|
||||
import com.qiniu.android.storage.UploadManager;
|
||||
import com.qiniu.android.storage.UploadOptions;
|
||||
|
||||
|
||||
import org.json.JSONException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
import okhttp3.MediaType;
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.RequestBody;
|
||||
|
||||
public class UserHeadEditActivity extends BaseActivity implements CommonCallback<File> {
|
||||
private ActivityHeadUserEditBinding binding;
|
||||
@@ -148,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<Result<StsCredentialsBean>>() {
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss(file, isHead);
|
||||
// toAliYunOss(file, isHead);
|
||||
toQIiNiuYunOss(file, isHead);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -309,83 +287,196 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
|
||||
}
|
||||
|
||||
|
||||
private void toAliYunOss(File file, boolean isHead) {
|
||||
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
String bucketName = IMUIKitConfig.bucketName;
|
||||
// private void toAliYunOss(File file, boolean isHead) {
|
||||
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
//// String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
//// String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
//// String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
//
|
||||
// String accessKeyId = "";
|
||||
// String accessKeySecret = "";
|
||||
// String securityToken = "";
|
||||
// String bucketName = IMUIKitConfig.bucketName;
|
||||
//
|
||||
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
// toUpdateOss(bucketName, 0, oss, file, isHead);
|
||||
//
|
||||
// }
|
||||
|
||||
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
toUpdateOss(bucketName, 0, oss, file, isHead);
|
||||
|
||||
private void toQIiNiuYunOss(File file, boolean isHead) {
|
||||
String updatePathPic = "postHomepageBackground";
|
||||
String updatePathPicHead = "userAvatarFileName";
|
||||
|
||||
// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file)));
|
||||
UploadOptions options = new UploadOptions(null, null, true,
|
||||
(key, percent) -> {
|
||||
LogUtils.i("结果是啥进度：" + percent);
|
||||
}, () -> {
|
||||
LogUtils.i("结果是啥进度112222222111：");
|
||||
return false;
|
||||
});
|
||||
// Zone zone = FixedZone.zoneAs0;
|
||||
Configuration configuration = new Configuration.Builder()
|
||||
// .connectTimeout(10) // 链接超时。默认10秒
|
||||
// .responseTimeout(60) // 服务器响应超时。默认60秒
|
||||
// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。
|
||||
.build();
|
||||
UploadManager uploadManager = new UploadManager(configuration);
|
||||
|
||||
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
|
||||
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
|
||||
// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this);
|
||||
// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD
|
||||
// immchat
|
||||
|
||||
String files = "media/" + updatePathPic + "/" + fileName;
|
||||
if (isHead) {
|
||||
files = "media/" + updatePathPicHead + "/" + fileName;
|
||||
}
|
||||
|
||||
byte[] sss = convertFileToBytes(file);
|
||||
LogUtils.i("结果是啥开始：" + sss);
|
||||
|
||||
uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> {
|
||||
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
|
||||
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
|
||||
dimessLoadingDialog();
|
||||
if (info != null && info.isOK()) {
|
||||
// 上传成功
|
||||
try {
|
||||
if (isHead) {
|
||||
LogUtils.i("地址是啥：" + response.getString("key"));
|
||||
toPush("https://qn.hnsdl.com/" + response.getString("key"), isHead);
|
||||
} else {
|
||||
LogUtils.i("地址是啥：" + response.getString("key"));
|
||||
toPush(response.getString("key"), isHead);
|
||||
}
|
||||
} catch (JSONException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
// 上传失败
|
||||
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
|
||||
}
|
||||
}, options);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
|
||||
public static byte[] convertFileToBytes(File file) {
|
||||
// 使用ByteArrayOutputStream来收集字节数据
|
||||
FileInputStream fis = null;
|
||||
try {
|
||||
fis = new FileInputStream(file);
|
||||
byte[] bytesArray = new byte[(int) file.length()];
|
||||
fis.read(bytesArray);
|
||||
fis.close();
|
||||
return bytesArray;
|
||||
|
||||
} catch (FileNotFoundException e) {
|
||||
// throw new RuntimeException(e);
|
||||
return null;
|
||||
} catch (IOException e) {
|
||||
// throw new RuntimeException(e);
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Unicode转 汉字字符串
|
||||
*
|
||||
* @param str \u6728
|
||||
* @return '木' 26408
|
||||
*/
|
||||
public static String unicodeToString(String str) {
|
||||
|
||||
Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
|
||||
Matcher matcher = pattern.matcher(str);
|
||||
char ch;
|
||||
while (matcher.find()) {
|
||||
//group 6728
|
||||
String group = matcher.group(2);
|
||||
//ch:'木' 26408
|
||||
ch = (char) Integer.parseInt(group, 16);
|
||||
//group1 \u6728
|
||||
String group1 = matcher.group(1);
|
||||
str = str.replace(group1, ch + "");
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
public static Handler handler = new Handler();
|
||||
|
||||
//
|
||||
private void toUpdateOss(String bucketName, int i, OSSClient oss, File file, boolean isHead) {
|
||||
LogUtils.i("1111111111111111111");
|
||||
String updatePathPic = "postHomepageBackground";
|
||||
String updatePathPicHead = "userAvatarFileName";
|
||||
|
||||
LogUtils.i("22222222222222222");
|
||||
|
||||
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
|
||||
LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
|
||||
LogUtils.i("文件地址是啥1：" + file.getPath());
|
||||
|
||||
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + fileName, file.getAbsolutePath());
|
||||
if (isHead) {
|
||||
put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
|
||||
}
|
||||
put.setProgressCallback((request, currentSize, totalSize) -> {
|
||||
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
|
||||
|
||||
});
|
||||
LogUtils.i("55555555555555");
|
||||
|
||||
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
|
||||
@Override
|
||||
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
|
||||
LogUtils.i("PutObject", "UploadSuccess");
|
||||
LogUtils.i("ETag", result.getETag());
|
||||
LogUtils.i("RequestId", result.getRequestId());
|
||||
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
|
||||
|
||||
handler.post(() -> {
|
||||
if (isHead) {
|
||||
toPush(IMUIKitConfig.OSS_URL + "media/" + updatePathPicHead + "/" + fileName, isHead);
|
||||
} else {
|
||||
LogUtils.i("地址是啥："+IMUIKitConfig.OSS_URL+"media/" + updatePathPic + "/" + fileName);
|
||||
toPush("media/" + updatePathPic + "/" + fileName, isHead);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
|
||||
dimessLoadingDialog();
|
||||
LogUtils.i("ErrorCode", clientExcepion.getMessage());
|
||||
|
||||
// 请求异常。
|
||||
if (clientExcepion != null) {
|
||||
// 本地异常，如网络异常等。
|
||||
clientExcepion.printStackTrace();
|
||||
}
|
||||
if (serviceException != null) {
|
||||
// 服务异常。
|
||||
LogUtils.i("ErrorCode", serviceException.getErrorCode());
|
||||
LogUtils.i("RequestId", serviceException.getRequestId());
|
||||
LogUtils.i("HostId", serviceException.getHostId());
|
||||
LogUtils.i("RawMessage", serviceException.getRawMessage());
|
||||
}
|
||||
}
|
||||
});
|
||||
// private void toUpdateOss(String bucketName, int i, OSSClient oss, File file, boolean isHead) {
|
||||
// LogUtils.i("1111111111111111111");
|
||||
// String updatePathPic = "postHomepageBackground";
|
||||
// String updatePathPicHead = "userAvatarFileName";
|
||||
//
|
||||
// LogUtils.i("22222222222222222");
|
||||
//
|
||||
// String fileName = System.currentTimeMillis() + "_" + file.getName();
|
||||
// LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
|
||||
// LogUtils.i("文件地址是啥1：" + file.getPath());
|
||||
//
|
||||
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + fileName, file.getAbsolutePath());
|
||||
// if (isHead) {
|
||||
// put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
|
||||
// }
|
||||
}
|
||||
// put.setProgressCallback((request, currentSize, totalSize) -> {
|
||||
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
|
||||
//
|
||||
// });
|
||||
// LogUtils.i("55555555555555");
|
||||
//
|
||||
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
|
||||
// @Override
|
||||
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
|
||||
// LogUtils.i("PutObject", "UploadSuccess");
|
||||
// LogUtils.i("ETag", result.getETag());
|
||||
// LogUtils.i("RequestId", result.getRequestId());
|
||||
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
|
||||
//
|
||||
// handler.post(() -> {
|
||||
// if (isHead) {
|
||||
// toPush(IMUIKitConfig.OSS_URL + "media/" + updatePathPicHead + "/" + fileName, isHead);
|
||||
// } else {
|
||||
// LogUtils.i("地址是啥：" + IMUIKitConfig.OSS_URL + "media/" + updatePathPic + "/" + fileName);
|
||||
// toPush("media/" + updatePathPic + "/" + fileName, isHead);
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
|
||||
// dimessLoadingDialog();
|
||||
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
|
||||
//
|
||||
// // 请求异常。
|
||||
// if (clientExcepion != null) {
|
||||
// // 本地异常，如网络异常等。
|
||||
// clientExcepion.printStackTrace();
|
||||
// }
|
||||
// if (serviceException != null) {
|
||||
// // 服务异常。
|
||||
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
|
||||
// LogUtils.i("RequestId", serviceException.getRequestId());
|
||||
// LogUtils.i("HostId", serviceException.getHostId());
|
||||
// LogUtils.i("RawMessage", serviceException.getRawMessage());
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//// }
|
||||
// }
|
||||
|
||||
private void toPush(String fileName, boolean isHead) {
|
||||
Map<String, Object> maps = new HashMap<>();
|
||||
@@ -520,9 +611,9 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
|
||||
}
|
||||
|
||||
private void startPickMedia(boolean isBg) {
|
||||
if(!isBg){
|
||||
if (!isBg) {
|
||||
PhotoPicker.getInstance().getAPhotoFromAlbumCropAndUpload(UserHeadEditActivity.this, this);
|
||||
}else{
|
||||
} else {
|
||||
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
|
||||
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(UserHeadEditActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
|
||||
whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down);
|
||||
@@ -569,9 +660,9 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
|
||||
public void onResult(ArrayList<LocalMedia> result) {
|
||||
for (int i = 0; i < result.size(); ++i) {
|
||||
// Uri uri = Uri.parse(result.get(i).getAvailablePath());
|
||||
LogUtils.i("地址是啥："+result.get(i).getRealPath());
|
||||
LogUtils.i("地址是啥：" + result.get(i).getRealPath());
|
||||
File file = new File(result.get(i).getRealPath());
|
||||
toUpdateBg(file,false);
|
||||
toUpdateBg(file, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/*");
|
||||
@@ -2,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());
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.main.mine.photo;
|
||||
package com.hbl.lewan.main.mine.photo;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.res.ColorStateList;
|
||||
@@ -21,32 +21,32 @@ import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.base.LllChatBaseActivity;
|
||||
import com.dskj.rbchat.databinding.ActivityAddphotosBinding;
|
||||
import com.dskj.rbchat.dialog.SelectPhotoTypeDialog;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.model.UserAlbumBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.ItemDragTouchHelperCallback;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.base.LllChatBaseActivity;
|
||||
import com.hbl.lewan.databinding.ActivityAddphotosBinding;
|
||||
import com.hbl.lewan.dialog.SelectPhotoTypeDialog;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.model.UserAlbumBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.ItemDragTouchHelperCallback;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.google.gson.Gson;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
@@ -61,11 +61,19 @@ import com.netease.yunxin.kit.chatkit.ui.dialog.PermissionExplainDialog;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.utils.PermissionUtils;
|
||||
import com.netease.yunxin.kit.common.utils.SizeUtils;
|
||||
import com.qiniu.android.storage.Configuration;
|
||||
import com.qiniu.android.storage.UploadManager;
|
||||
import com.qiniu.android.storage.UploadOptions;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
@@ -165,6 +173,7 @@ public class AddPhotoActivity extends LllChatBaseActivity implements TextWatcher
|
||||
}
|
||||
|
||||
StsCredentialsBean stsCredentialsBean;
|
||||
String stsCredentialsBean1;
|
||||
|
||||
private void toShangchuanAli() {
|
||||
showLoading();
|
||||
@@ -172,14 +181,17 @@ public class AddPhotoActivity extends LllChatBaseActivity implements TextWatcher
|
||||
toSubmit();
|
||||
return;
|
||||
}
|
||||
Api.getInstance().stsCredentials()
|
||||
|
||||
Api.getInstance().stsCredentials1()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss();
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean1 = feedbackResp.data;
|
||||
// toAliYunOss(file, isHead);
|
||||
toUpdateOssNew(0);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -189,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();
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.main.mine.photo;
|
||||
package com.hbl.lewan.main.mine.photo;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Activity;
|
||||
@@ -30,43 +30,43 @@ import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.alibaba.sdk.android.oss.ClientException;
|
||||
import com.alibaba.sdk.android.oss.OSSClient;
|
||||
import com.alibaba.sdk.android.oss.ServiceException;
|
||||
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
//import com.alibaba.sdk.android.oss.ClientException;
|
||||
//import com.alibaba.sdk.android.oss.OSSClient;
|
||||
//import com.alibaba.sdk.android.oss.ServiceException;
|
||||
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.base.LllChatBaseActivity;
|
||||
import com.dskj.rbchat.databinding.ActivityUserphotosBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityUserphotosDetailsBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.ActionInputConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.SelectPhotosMoveDialog;
|
||||
import com.dskj.rbchat.event.UserAlbumsUpdateEvent;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.AlbumItemBean;
|
||||
import com.dskj.rbchat.model.HisChatShowBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.model.UserAlbumBean;
|
||||
import com.dskj.rbchat.model.UserShareBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ShareDateUtils;
|
||||
import com.dskj.rbchat.voom.TiktokActivity;
|
||||
import com.dskj.rbchat.welcome.WelcomeActivity;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.base.LllChatBaseActivity;
|
||||
import com.hbl.lewan.databinding.ActivityUserphotosBinding;
|
||||
import com.hbl.lewan.databinding.ActivityUserphotosDetailsBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.ActionInputConfirmDialog;
|
||||
import com.hbl.lewan.dialog.SelectPhotosMoveDialog;
|
||||
import com.hbl.lewan.event.UserAlbumsUpdateEvent;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.AlbumItemBean;
|
||||
import com.hbl.lewan.model.HisChatShowBean;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.model.UserAlbumBean;
|
||||
import com.hbl.lewan.model.UserShareBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.ShareDateUtils;
|
||||
import com.hbl.lewan.voom.TiktokActivity;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog;
|
||||
import com.luck.picture.lib.basic.PictureSelector;
|
||||
import com.luck.picture.lib.config.SelectMimeType;
|
||||
@@ -104,13 +104,21 @@ import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
import com.netease.yunxin.kit.corekit.im.model.FriendInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
|
||||
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
|
||||
import com.qiniu.android.storage.Configuration;
|
||||
import com.qiniu.android.storage.UploadManager;
|
||||
import com.qiniu.android.storage.UploadOptions;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
@@ -707,6 +715,8 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
|
||||
|
||||
List<String> uriStrings = new ArrayList<>();
|
||||
StsCredentialsBean stsCredentialsBean;
|
||||
String stsCredentialsBean1;
|
||||
|
||||
List<LocalMedia> localMedias = new ArrayList<>();
|
||||
List<String> outputStrings = new ArrayList<>();
|
||||
|
||||
@@ -774,14 +784,31 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
|
||||
|
||||
public void onSubmitPic() {
|
||||
showLoading();
|
||||
Api.getInstance().stsCredentials()
|
||||
// Api.getInstance().stsCredentials()
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
// stsCredentialsBean = feedbackResp.data;
|
||||
// toAliYunOss();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// dismissLoading();
|
||||
// }
|
||||
// });
|
||||
Api.getInstance().stsCredentials1()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss();
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean1 = feedbackResp.data;
|
||||
// toAliYunOss(file, isHead);
|
||||
toUpdateOssNew(0);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -791,77 +818,143 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
|
||||
});
|
||||
}
|
||||
|
||||
private void toAliYunOss() {
|
||||
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
String bucketName = IMUIKitConfig.bucketName;
|
||||
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
toUpdateOss(bucketName, 0, oss);
|
||||
|
||||
}
|
||||
private void 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();
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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));
|
||||
@@ -2,14 +2,14 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main.mine.setting;
|
||||
package com.hbl.lewan.main.mine.setting;
|
||||
|
||||
import android.os.Bundle;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityClearCacheBinding;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityClearCacheBinding;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -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));
|
||||
// }
|
||||
}
|
||||
@@ -2,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;
|
||||
@@ -2,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();
|
||||
}
|
||||
@@ -2,12 +2,12 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.main.mine.setting;
|
||||
package com.hbl.lewan.main.mine.setting;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.common.ui.viewmodel.BaseViewModel;
|
||||
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
|
||||
@@ -2,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<List<NearbySearchBean>> o) {
|
||||
changeInfo(o.results);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
|
||||
}
|
||||
});
|
||||
// Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
|
||||
// "true", BuildConfig.APIKEY)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserverNew<>() {
|
||||
// @Override
|
||||
// public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
|
||||
// changeInfo(o.results);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
//
|
||||
// }
|
||||
// });
|
||||
}else{
|
||||
Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
|
||||
"true", BuildConfig.APIKEY,s)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserverNew<>() {
|
||||
@Override
|
||||
public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
|
||||
changeInfo(o.results);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
|
||||
}
|
||||
});
|
||||
// Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
|
||||
// "true", BuildConfig.APIKEY,s)
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserverNew<>() {
|
||||
// @Override
|
||||
// public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
|
||||
// changeInfo(o.results);
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
//
|
||||
// }
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -451,12 +451,12 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
|
||||
}
|
||||
|
||||
protected synchronized void buildGoogleApiClient() {
|
||||
mGoogleApiClient = new GoogleApiClient.Builder(this)
|
||||
.addConnectionCallbacks(this)
|
||||
.addOnConnectionFailedListener(this)
|
||||
.addApi(LocationServices.API)
|
||||
.build();
|
||||
mGoogleApiClient.connect();
|
||||
// mGoogleApiClient = new GoogleApiClient.Builder(this)
|
||||
// .addConnectionCallbacks(this)
|
||||
// .addOnConnectionFailedListener(this)
|
||||
// .addApi(LocationServices.API)
|
||||
// .build();
|
||||
// mGoogleApiClient.connect();
|
||||
}
|
||||
|
||||
//
|
||||
@@ -467,7 +467,7 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
|
||||
// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
|
||||
// }
|
||||
// LogUtils.i("地点是啥："+location.getLongitude()+";"+location.getLatitude()+";"+ GsonUtils.beanToJSONString(location));
|
||||
// Api.getInstance().nearbysearch(location.getLatitude()+","+location.getLongitude(),"10000","","true",getString(com.dskj.rbchat.R.string.google_map_key))
|
||||
// Api.getInstance().nearbysearch(location.getLatitude()+","+location.getLongitude(),"10000","","true",getString(com.hbl.lewan.R.string.google_map_key))
|
||||
// .subscribeOn(Schedulers.io())
|
||||
// .observeOn(AndroidSchedulers.mainThread())
|
||||
// .subscribe(new BaseObserver<Result>() {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class AdBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class AddFriendBean {
|
||||
public String user_uid;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class AfterCountBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class AiConvertBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class AuthorizeBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class AvaterBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class BankBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class BankListBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class CallBean {
|
||||
/**0 语音消息 1 视频消息*/
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class ChargingBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class CirPushMessage {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import com.netease.yunxin.kit.chatkit.ui.custom.StickerAttachment;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
/**
|
||||
* 配置开关
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class CreditsConfBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class DongTaiActionBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class ExplorePostPinglunBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class ForBiddenInfoBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class FukuanResultBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class GroupActionBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class GroupListBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class H5ChangeTitle {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class JsBridgeOrderBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class LinkBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class LngLat {
|
||||
public double longitude;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class LoginBean extends RosterElementEntity {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class LoginBeanJiaXu {
|
||||
private String loginUrl;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class LoginUserBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class MessageAtQuBean {
|
||||
private String content;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class MessageBean{
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class MessagefcmBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import android.print.PageRange;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class OauthAppBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class PassWordLoginBean {
|
||||
private String phone;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class PayInfoBean {
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class ReadRxBusBean {
|
||||
public int type;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RebootMessageBean {
|
||||
private String content;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RefreshTokenBean {
|
||||
private String refreshToken;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RegisteredBean {
|
||||
private boolean registered;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class ReportBean {
|
||||
private int index;
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RtcTokenBean {
|
||||
private int role;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RtcTokenResBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RxBusEditMessage {
|
||||
private String toUid;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RxBusLoadMoreListBean {
|
||||
private int type;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class RxCommLikeBean {
|
||||
private String postId;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class SearchBean {
|
||||
public String searchText;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class StaffServiceIdBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class StatisticsBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class StsCredentialsBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class SystemResultBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class TaskBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class TopUpBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
/**
|
||||
* 转账记录
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class TrcGroupBean {
|
||||
private int rtcType;
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
public class UserRankBean {
|
||||
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class UsersExistBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class VersionBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class WalletBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class WithCashBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class WithdrawCashBean {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.model;
|
||||
package com.hbl.lewan.model;
|
||||
|
||||
|
||||
public class WorldChatBean {
|
||||
@@ -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;
|
||||
@@ -1,63 +1,64 @@
|
||||
package com.dskj.rbchat.network;
|
||||
package com.hbl.lewan.network;
|
||||
|
||||
|
||||
import com.blankj.utilcode.util.LogUtils;
|
||||
import com.dskj.rbchat.model.ActivityMsgBean;
|
||||
import com.dskj.rbchat.model.AdBean;
|
||||
import com.dskj.rbchat.model.AfterCountBean;
|
||||
import com.dskj.rbchat.model.AiConvertBean;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.AuthorizeBean;
|
||||
import com.dskj.rbchat.model.AvaterBean;
|
||||
import com.dskj.rbchat.model.BankBean;
|
||||
import com.dskj.rbchat.model.BankListBean;
|
||||
import com.dskj.rbchat.model.BillBean;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.ChargingBean;
|
||||
import com.dskj.rbchat.model.ConfigBean;
|
||||
import com.dskj.rbchat.model.CreditsConfBean;
|
||||
import com.dskj.rbchat.model.ExchangeConfBean;
|
||||
import com.dskj.rbchat.model.ForBiddenInfoBean;
|
||||
import com.dskj.rbchat.model.FukuanResultBean;
|
||||
import com.dskj.rbchat.model.GameBean;
|
||||
import com.dskj.rbchat.model.GroupActionBean;
|
||||
import com.dskj.rbchat.model.GroupBeanResult;
|
||||
import com.dskj.rbchat.model.InstallmentBean;
|
||||
import com.dskj.rbchat.model.InviteDetailsBean;
|
||||
import com.dskj.rbchat.model.LinkBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.LoginBeanJiaXu;
|
||||
import com.dskj.rbchat.model.MessageBean;
|
||||
import com.dskj.rbchat.model.NearbySearchBean;
|
||||
import com.dskj.rbchat.model.NewsBean;
|
||||
import com.dskj.rbchat.model.NotifyCountBean;
|
||||
import com.dskj.rbchat.model.PassWordLoginBean;
|
||||
import com.dskj.rbchat.model.PayInfoBean;
|
||||
import com.dskj.rbchat.model.QuesListBean;
|
||||
import com.dskj.rbchat.model.ReadMessageBean;
|
||||
import com.dskj.rbchat.model.RegisteredBean;
|
||||
import com.dskj.rbchat.model.RtcTokenBean;
|
||||
import com.dskj.rbchat.model.RtcTokenResBean;
|
||||
import com.dskj.rbchat.model.SendOrderBean;
|
||||
import com.dskj.rbchat.model.SetUpdatesBean;
|
||||
import com.dskj.rbchat.model.StaffServiceIdBean;
|
||||
import com.dskj.rbchat.model.StatisticsBean;
|
||||
import com.dskj.rbchat.model.StsCredentialsBean;
|
||||
import com.dskj.rbchat.model.TaskBean;
|
||||
import com.dskj.rbchat.model.TopBean;
|
||||
import com.dskj.rbchat.model.TopOrderBean;
|
||||
import com.dskj.rbchat.model.TopUpBean;
|
||||
import com.dskj.rbchat.model.TrcGroupBean;
|
||||
import com.dskj.rbchat.model.UserAlbumBean;
|
||||
import com.dskj.rbchat.model.UserRankBean;
|
||||
import com.dskj.rbchat.model.UsersExistBean;
|
||||
import com.dskj.rbchat.model.VersionBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.model.WithCashBean;
|
||||
import com.dskj.rbchat.model.WorldChatBean;
|
||||
import com.dskj.rbchat.wxapi.bean.WeiXinInfo;
|
||||
import com.dskj.rbchat.wxapi.bean.WeiXinToken;
|
||||
import com.hbl.lewan.BuildConfig;
|
||||
import com.hbl.lewan.model.ActivityMsgBean;
|
||||
import com.hbl.lewan.model.AdBean;
|
||||
import com.hbl.lewan.model.AfterCountBean;
|
||||
import com.hbl.lewan.model.AiConvertBean;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.AuthorizeBean;
|
||||
import com.hbl.lewan.model.AvaterBean;
|
||||
import com.hbl.lewan.model.BankBean;
|
||||
import com.hbl.lewan.model.BankListBean;
|
||||
import com.hbl.lewan.model.BillBean;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.ChargingBean;
|
||||
import com.hbl.lewan.model.ConfigBean;
|
||||
import com.hbl.lewan.model.CreditsConfBean;
|
||||
import com.hbl.lewan.model.ExchangeConfBean;
|
||||
import com.hbl.lewan.model.ForBiddenInfoBean;
|
||||
import com.hbl.lewan.model.FukuanResultBean;
|
||||
import com.hbl.lewan.model.GameBean;
|
||||
import com.hbl.lewan.model.GroupActionBean;
|
||||
import com.hbl.lewan.model.GroupBeanResult;
|
||||
import com.hbl.lewan.model.InstallmentBean;
|
||||
import com.hbl.lewan.model.InviteDetailsBean;
|
||||
import com.hbl.lewan.model.LinkBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.LoginBeanJiaXu;
|
||||
import com.hbl.lewan.model.MessageBean;
|
||||
import com.hbl.lewan.model.NearbySearchBean;
|
||||
import com.hbl.lewan.model.NewsBean;
|
||||
import com.hbl.lewan.model.NotifyCountBean;
|
||||
import com.hbl.lewan.model.PassWordLoginBean;
|
||||
import com.hbl.lewan.model.PayInfoBean;
|
||||
import com.hbl.lewan.model.QuesListBean;
|
||||
import com.hbl.lewan.model.ReadMessageBean;
|
||||
import com.hbl.lewan.model.RegisteredBean;
|
||||
import com.hbl.lewan.model.RtcTokenBean;
|
||||
import com.hbl.lewan.model.RtcTokenResBean;
|
||||
import com.hbl.lewan.model.SendOrderBean;
|
||||
import com.hbl.lewan.model.SetUpdatesBean;
|
||||
import com.hbl.lewan.model.StaffServiceIdBean;
|
||||
import com.hbl.lewan.model.StatisticsBean;
|
||||
import com.hbl.lewan.model.StsCredentialsBean;
|
||||
import com.hbl.lewan.model.TaskBean;
|
||||
import com.hbl.lewan.model.TopBean;
|
||||
import com.hbl.lewan.model.TopOrderBean;
|
||||
import com.hbl.lewan.model.TopUpBean;
|
||||
import com.hbl.lewan.model.TrcGroupBean;
|
||||
import com.hbl.lewan.model.UserAlbumBean;
|
||||
import com.hbl.lewan.model.UserRankBean;
|
||||
import com.hbl.lewan.model.UsersExistBean;
|
||||
import com.hbl.lewan.model.VersionBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.model.WithCashBean;
|
||||
import com.hbl.lewan.model.WorldChatBean;
|
||||
import com.hbl.lewan.wxapi.bean.WeiXinInfo;
|
||||
import com.hbl.lewan.wxapi.bean.WeiXinToken;
|
||||
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
|
||||
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
|
||||
import com.netease.yunxin.kit.chatkit.ui.model.TransferBean;
|
||||
@@ -96,6 +97,11 @@ import retrofit2.http.QueryMap;
|
||||
|
||||
public interface ApiService {
|
||||
|
||||
/***
|
||||
* 打包的国家编码
|
||||
*/
|
||||
// String AREA_CODE = "+886";
|
||||
String AREA_CODE = BuildConfig.AREA_CODE;
|
||||
|
||||
/**
|
||||
* 测试环境
|
||||
@@ -793,7 +799,8 @@ public interface ApiService {
|
||||
|
||||
@GET("/file/stsCredentials")
|
||||
Observable<Result<StsCredentialsBean>> stsCredentials();
|
||||
|
||||
@GET("/file/stsCredentials")
|
||||
Observable<Result<String>> stsCredentials1();
|
||||
|
||||
// @POST(Const.TESTTOY_SAVE_USER_MACHINE)
|
||||
// Observable<Result1> save_user_machine(@Body Map<String, Object> requestBody);
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.network;
|
||||
package com.hbl.lewan.network;
|
||||
|
||||
import okhttp3.OkHttpClient;
|
||||
import retrofit2.Retrofit;
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.network;
|
||||
package com.hbl.lewan.network;
|
||||
|
||||
import com.google.gson.JsonParseException;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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 {
|
||||
@@ -2,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;
|
||||
|
||||
@@ -2,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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.text.InputFilter;
|
||||
import android.text.Spanned;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import java.math.BigDecimal;
|
||||
@@ -2,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 {
|
||||
|
||||
@@ -2,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));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
@@ -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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.text.TextUtils;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
@@ -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.
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
@@ -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);
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import static android.Manifest.permission.WRITE_SETTINGS;
|
||||
|
||||
@@ -20,7 +20,7 @@ import android.view.WindowManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.RequiresPermission;
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.graphics.Rect;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.DisplayMetrics;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
package com.dskj.rbchat.utils;
|
||||
package com.hbl.lewan.utils;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ClipData;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils.play;
|
||||
package com.hbl.lewan.utils.play;
|
||||
|
||||
public class AmountBean {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.utils.play;
|
||||
package com.hbl.lewan.utils.play;
|
||||
|
||||
|
||||
public class PlaySound {
|
||||
@@ -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;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.voom;
|
||||
package com.hbl.lewan.voom;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
@@ -25,10 +25,10 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.SimpleItemAnimator;
|
||||
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
|
||||
|
||||
import com.amap.api.location.AMapLocation;
|
||||
import com.amap.api.location.AMapLocationClient;
|
||||
import com.amap.api.location.AMapLocationClientOption;
|
||||
import com.amap.api.location.AMapLocationListener;
|
||||
//import com.amap.api.location.AMapLocation;
|
||||
//import com.amap.api.location.AMapLocationClient;
|
||||
//import com.amap.api.location.AMapLocationClientOption;
|
||||
//import com.amap.api.location.AMapLocationListener;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.DataSource;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
@@ -39,28 +39,28 @@ import com.bumptech.glide.request.target.ImageViewTarget;
|
||||
import com.bumptech.glide.request.target.SimpleTarget;
|
||||
import com.bumptech.glide.request.target.Target;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentCircleBinding;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.ApiService;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ScreenUtils;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.ethanhua.skeleton.Skeleton;
|
||||
import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentCircleBinding;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.RxBusLoadMoreListBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.ScreenUtils;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
//import com.ethanhua.skeleton.Skeleton;
|
||||
//import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
@@ -79,20 +79,20 @@ import rx.schedulers.Schedulers;
|
||||
public class CircleFragment extends BaseFragment {
|
||||
private FragmentCircleBinding binding;
|
||||
|
||||
AMapLocation aMapLocation;
|
||||
//声明AMapLocationClientOption对象
|
||||
public AMapLocationClientOption mLocationOption = null;
|
||||
//声明AMapLocationClient类对象
|
||||
public AMapLocationClient mLocationClient = null;
|
||||
//声明定位回调监听器
|
||||
public AMapLocationListener mLocationListener;
|
||||
// AMapLocation aMapLocation;
|
||||
// //声明AMapLocationClientOption对象
|
||||
// public AMapLocationClientOption mLocationOption = null;
|
||||
// //声明AMapLocationClient类对象
|
||||
// public AMapLocationClient mLocationClient = null;
|
||||
// //声明定位回调监听器
|
||||
// public AMapLocationListener mLocationListener;
|
||||
|
||||
public static List<AlbumBean> titles = new ArrayList<>();
|
||||
static CommonAdapter commonAdapter;
|
||||
private int categoryId;
|
||||
StaggeredGridLayoutManager linearLayoutManager;
|
||||
protected ActivityResultLauncher<String[]> permissionLauncher;
|
||||
SkeletonScreen skeletonScreen;
|
||||
// SkeletonScreen skeletonScreen;
|
||||
|
||||
public static void changeBean(AlbumBean albumBean, int pos) {
|
||||
if (titles.size() > pos) {
|
||||
@@ -102,15 +102,15 @@ public class CircleFragment extends BaseFragment {
|
||||
}
|
||||
|
||||
private void initShowSkeleton() {
|
||||
skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
.adapter(commonAdapter)
|
||||
.load(R.layout.discover_child_item_default)
|
||||
.shimmer(true) // whether show shimmer animation. default is true
|
||||
.count(10) // the recycler view item count. default is 10
|
||||
.color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
.angle(20) // the shimmer angle. default is 20;
|
||||
.duration(1500) // the shimmer animation duration. default is 1000;
|
||||
.frozen(false).show();
|
||||
// skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
// .adapter(commonAdapter)
|
||||
// .load(R.layout.discover_child_item_default)
|
||||
// .shimmer(true) // whether show shimmer animation. default is true
|
||||
// .count(10) // the recycler view item count. default is 10
|
||||
// .color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
// .angle(20) // the shimmer angle. default is 20;
|
||||
// .duration(1500) // the shimmer animation duration. default is 1000;
|
||||
// .frozen(false).show();
|
||||
}
|
||||
|
||||
int type;
|
||||
@@ -305,24 +305,9 @@ public class CircleFragment extends BaseFragment {
|
||||
if (s.getType() == 1) {
|
||||
if (!TextUtils.isEmpty(s.getPicture1())) {
|
||||
if (s.getPicture1().startsWith("http")) {
|
||||
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
|
||||
// Glide.with(getActivity())
|
||||
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
|
||||
// .apply(requestOptions).into(pic_ic);
|
||||
toUrl(holder, s.getPicture1().replace("/pic_output/", "/pic_input/"));
|
||||
} 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);
|
||||
@@ -2,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;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.voom;
|
||||
package com.hbl.lewan.voom;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
@@ -22,23 +22,23 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentCommentBinding;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.CommentBean;
|
||||
import com.dskj.rbchat.model.RxCommLikeBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.KeyboardUtil;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentCommentBinding;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.CommentBean;
|
||||
import com.hbl.lewan.model.RxCommLikeBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.KeyboardUtil;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
|
||||
@@ -127,6 +127,7 @@ public class CommentFragment extends BaseFragment {
|
||||
}
|
||||
|
||||
String replyCommentId = null;
|
||||
boolean isComment = false;
|
||||
private void toComment(String toString) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("postId", albumBean.getPostId());
|
||||
@@ -137,12 +138,17 @@ public class CommentFragment extends BaseFragment {
|
||||
if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
|
||||
map.put("substationId", IMUIKitConfig.SUBSTATIONID);
|
||||
}
|
||||
if(isComment){
|
||||
return;
|
||||
}
|
||||
isComment = true;
|
||||
Api.getInstance().postComment(map)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result>() {
|
||||
@Override
|
||||
public void onSuccess(Result feedbackResp) {
|
||||
isComment = false;
|
||||
binding.commentEt.setText("");
|
||||
binding.commentEt.setHint(getString(R.string.say_somthing_txt));
|
||||
replyCommentId = null;
|
||||
@@ -154,6 +160,7 @@ public class CommentFragment extends BaseFragment {
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
isComment = false;
|
||||
ToastX.showShortToast(msg);
|
||||
|
||||
}
|
||||
@@ -2,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;
|
||||
@@ -2,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);
|
||||
@@ -2,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<Result<StsCredentialsBean>>() {
|
||||
// @Override
|
||||
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
// stsCredentialsBean = feedbackResp.data;
|
||||
// toAliYunOss();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onError(int code, String msg) {
|
||||
// dimessLoadingDialog();
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
Api.getInstance().stsCredentials1()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
|
||||
.subscribe(new BaseObserver<>() {
|
||||
@Override
|
||||
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
|
||||
stsCredentialsBean = feedbackResp.data;
|
||||
toAliYunOss();
|
||||
public void onSuccess(Result<String> feedbackResp) {
|
||||
stsCredentialsBean1 = feedbackResp.data;
|
||||
// toAliYunOss(file, isHead);
|
||||
toUpdateOssNew(0);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int code, String msg) {
|
||||
dimessLoadingDialog();
|
||||
dismissLoading();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void toAliYunOss() {
|
||||
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
String bucketName = IMUIKitConfig.bucketName;
|
||||
// private void toAliYunOss() {
|
||||
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
|
||||
// String accessKeyId = stsCredentialsBean.getAccessKeyId();
|
||||
// String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
|
||||
// String securityToken = stsCredentialsBean.getSecurityToken();
|
||||
// String bucketName = IMUIKitConfig.bucketName;
|
||||
//
|
||||
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
// toUpdateOss(bucketName, 0, oss);
|
||||
//
|
||||
// }
|
||||
private void toUpdateOssNew( int i) {
|
||||
|
||||
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
|
||||
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
|
||||
toUpdateOss(bucketName, 0, oss);
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
private void toUpdateOss(String bucketName, int i, OSSClient oss) {
|
||||
String updatePathPic = "pic_input";
|
||||
String updatePathVideo = "video_input";
|
||||
// String outputPathPic = "pic_output";
|
||||
// String outputPathVideo = "video_output";
|
||||
String outputPathPic = "pic_input";
|
||||
String outputPathVideo = "video_input";
|
||||
// Calendar calendar= Calendar.getInstance();
|
||||
// String year = calendar.get(Calendar.YEAR)+"";
|
||||
// String month = (calendar.get(Calendar.MONTH)+1)<10?"0"+(calendar.get(Calendar.MONTH)+1):(calendar.get(Calendar.MONTH)+1)+"";
|
||||
// String d = calendar.get(Calendar.DATE)<10?"0"+calendar.get(Calendar.DAY_OF_MONTH):calendar.get(Calendar.DAY_OF_MONTH)+"";
|
||||
|
||||
UploadOptions options = new UploadOptions(null, null, true,
|
||||
(key, percent) -> {
|
||||
LogUtils.i("结果是啥进度：" + percent);
|
||||
}, () -> {
|
||||
LogUtils.i("结果是啥进度112222222111：");
|
||||
return false;
|
||||
});
|
||||
Configuration configuration = new Configuration.Builder()
|
||||
.build();
|
||||
UploadManager uploadManager = new UploadManager(configuration);
|
||||
|
||||
String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
|
||||
|
||||
if (i < uris.size()) {
|
||||
|
||||
// File file = new File(uriStrings.get(i));
|
||||
String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
|
||||
LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
|
||||
LogUtils.i("上传文件是啥:" + fileName);
|
||||
|
||||
// 构造上传请求。
|
||||
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
|
||||
|
||||
File file = new File(localMedias.get(i).getRealPath());
|
||||
String fileName = UUID.randomUUID().toString() + "_" + localMedias.get(i).getFileName();
|
||||
LogUtils.i("结果是啥开始：" + stsCredentialsBean1 + ";;" + file.getAbsolutePath());
|
||||
String files = "media/" + updatePathPic + "/" + data + "/" + fileName;
|
||||
if (localMedias.get(0).getMimeType().contains("video")) {
|
||||
put = new PutObjectRequest(bucketName, "media/" + updatePathVideo + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
|
||||
files = "media/" + updatePathVideo + "/" + data + "/" + fileName;
|
||||
}
|
||||
byte[] sss = convertFileToBytes(file);
|
||||
LogUtils.i("结果是啥开始：" + sss);
|
||||
|
||||
put.setProgressCallback((request, currentSize, totalSize) -> {
|
||||
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
|
||||
// if(isVideo){
|
||||
// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
|
||||
// }
|
||||
});
|
||||
String finalFiles = files;
|
||||
uploadManager.put(sss, files, stsCredentialsBean1, (key, info, response) -> {
|
||||
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
|
||||
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
|
||||
dismissLoading();
|
||||
if (info != null && info.isOK()) {
|
||||
// 上传成功
|
||||
// outputStrings.add(IMUIKitConfig.OSS_URL + files);
|
||||
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
|
||||
|
||||
//OSSAsyncTask task =
|
||||
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
|
||||
@Override
|
||||
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
|
||||
LogUtils.i("PutObject", "UploadSuccess");
|
||||
LogUtils.i("ETag", result.getETag());
|
||||
LogUtils.i("RequestId", result.getRequestId());
|
||||
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
|
||||
if (localMedias.get(0).getMimeType().contains("video")) {
|
||||
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathVideo + "/" + data + "/" + fileName);
|
||||
outputStrings.add(IMUIKitConfig.OSS_URL + finalFiles);
|
||||
} else {
|
||||
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathPic + "/" + data + "/" + fileName);
|
||||
outputStrings.add(IMUIKitConfig.OSS_URL + finalFiles);
|
||||
}
|
||||
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
|
||||
if (i == uris.size() - 1) {
|
||||
toPush();
|
||||
} else {
|
||||
toUpdateOss(bucketName, i + 1, oss);
|
||||
toUpdateOssNew( i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
@@ -2,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/"));
|
||||
// }
|
||||
@@ -2,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;
|
||||
@@ -2,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;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.voom;
|
||||
package com.hbl.lewan.voom;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -16,19 +16,19 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
||||
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.FragmentVoomBinding;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.MessageBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.voom.comm.CircleFragment1;
|
||||
import com.dskj.rbchat.voom.comm.CircleFragment2;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.FragmentVoomBinding;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.MessageBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.voom.comm.CircleFragment1;
|
||||
import com.hbl.lewan.voom.comm.CircleFragment2;
|
||||
import com.google.android.material.tabs.TabLayoutMediator;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
|
||||
@@ -46,7 +46,7 @@ public class VoomFragment extends BaseFragment {
|
||||
private List<Fragment> listFragment;
|
||||
private CircleFragment discoverFragment;
|
||||
private CircleFragment1 momentsFragment;
|
||||
private CircleFragment2 nearbyFragment;
|
||||
// private CircleFragment2 nearbyFragment;
|
||||
@Nullable
|
||||
@Override
|
||||
public View onCreateView(
|
||||
@@ -74,7 +74,7 @@ public class VoomFragment extends BaseFragment {
|
||||
listFragment = new ArrayList<>();
|
||||
listFragment.add(discoverFragment=CircleFragment.newInstance(0));
|
||||
listFragment.add(momentsFragment= CircleFragment1.newInstance(1));
|
||||
listFragment.add(nearbyFragment= CircleFragment2.newInstance(3));
|
||||
// listFragment.add(nearbyFragment= CircleFragment2.newInstance(3));
|
||||
CommunityAdapter adapter = new CommunityAdapter(getActivity(), titles, listFragment);
|
||||
binding.viewpager.setAdapter(adapter);
|
||||
//把TabLayout（选项卡布局）和ViewPager2绑定在一起。特别说明一下，下面这行代码是官方给的，特别好使。
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
@@ -23,10 +23,10 @@ import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
|
||||
|
||||
import com.amap.api.location.AMapLocation;
|
||||
import com.amap.api.location.AMapLocationClient;
|
||||
import com.amap.api.location.AMapLocationClientOption;
|
||||
import com.amap.api.location.AMapLocationListener;
|
||||
//import com.amap.api.location.AMapLocation;
|
||||
//import com.amap.api.location.AMapLocationClient;
|
||||
//import com.amap.api.location.AMapLocationClientOption;
|
||||
//import com.amap.api.location.AMapLocationListener;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.DataSource;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
@@ -37,29 +37,29 @@ import com.bumptech.glide.request.target.ImageViewTarget;
|
||||
import com.bumptech.glide.request.target.SimpleTarget;
|
||||
import com.bumptech.glide.request.target.Target;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentCircleBinding;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.ApiService;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ScreenUtils;
|
||||
import com.dskj.rbchat.voom.TiktokActivity;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.ethanhua.skeleton.Skeleton;
|
||||
import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentCircleBinding;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.RxBusLoadMoreListBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.ScreenUtils;
|
||||
import com.hbl.lewan.voom.TiktokActivity;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
//import com.ethanhua.skeleton.Skeleton;
|
||||
//import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
@@ -77,21 +77,21 @@ import rx.schedulers.Schedulers;
|
||||
|
||||
public class CircleFragment1 extends BaseFragment {
|
||||
private FragmentCircleBinding binding;
|
||||
|
||||
AMapLocation aMapLocation;
|
||||
//声明AMapLocationClientOption对象
|
||||
public AMapLocationClientOption mLocationOption = null;
|
||||
//声明AMapLocationClient类对象
|
||||
public AMapLocationClient mLocationClient = null;
|
||||
//声明定位回调监听器
|
||||
public AMapLocationListener mLocationListener;
|
||||
//
|
||||
// AMapLocation aMapLocation;
|
||||
// //声明AMapLocationClientOption对象
|
||||
// public AMapLocationClientOption mLocationOption = null;
|
||||
// //声明AMapLocationClient类对象
|
||||
// public AMapLocationClient mLocationClient = null;
|
||||
// //声明定位回调监听器
|
||||
// public AMapLocationListener mLocationListener;
|
||||
|
||||
public static List<AlbumBean> titles = new ArrayList<>();
|
||||
static CommonAdapter commonAdapter;
|
||||
private int categoryId;
|
||||
StaggeredGridLayoutManager linearLayoutManager;
|
||||
protected ActivityResultLauncher<String[]> permissionLauncher;
|
||||
SkeletonScreen skeletonScreen;
|
||||
// SkeletonScreen skeletonScreen;
|
||||
|
||||
public static void changeBean(AlbumBean albumBean,int pos){
|
||||
if(titles.size()>pos){
|
||||
@@ -101,15 +101,15 @@ public class CircleFragment1 extends BaseFragment {
|
||||
}
|
||||
|
||||
private void initShowSkeleton() {
|
||||
skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
.adapter(commonAdapter)
|
||||
.load(R.layout.discover_child_item_default)
|
||||
.shimmer(true) // whether show shimmer animation. default is true
|
||||
.count(10) // the recycler view item count. default is 10
|
||||
.color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
.angle(20) // the shimmer angle. default is 20;
|
||||
.duration(1500) // the shimmer animation duration. default is 1000;
|
||||
.frozen(false).show();
|
||||
// skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
// .adapter(commonAdapter)
|
||||
// .load(R.layout.discover_child_item_default)
|
||||
// .shimmer(true) // whether show shimmer animation. default is true
|
||||
// .count(10) // the recycler view item count. default is 10
|
||||
// .color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
// .angle(20) // the shimmer angle. default is 20;
|
||||
// .duration(1500) // the shimmer animation duration. default is 1000;
|
||||
// .frozen(false).show();
|
||||
}
|
||||
|
||||
int type;
|
||||
@@ -316,27 +316,13 @@ public class CircleFragment1 extends BaseFragment {
|
||||
if (s.getType() == 1) {
|
||||
if(!TextUtils.isEmpty(s.getPicture1())) {
|
||||
if (s.getPicture1().startsWith("http")) {
|
||||
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
|
||||
// Glide.with(getActivity())
|
||||
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
|
||||
// .apply(requestOptions).into(pic_ic);
|
||||
toUrl(holder,s.getPicture1().replace("/pic_output/", "/pic_input/"));
|
||||
} 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<Bitmap>() {
|
||||
// @Override
|
||||
// public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
|
||||
// Glide.with(getActivity())
|
||||
// .asBitmap()
|
||||
// .load(s.replace("/pic_output/", "/pic_input/"))
|
||||
// .placeholder(R.mipmap.voom_none_img)
|
||||
// .error(R.mipmap.voom_none_img)
|
||||
// .into(new SimpleTarget<Bitmap>() {
|
||||
// public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
|
||||
// //这个bitmap就是你图片url加载得到的结果
|
||||
//// //获取bitmap信息，可赋值给外部变量操作，也可在此时行操作。
|
||||
// ViewGroup.LayoutParams layoutParams = (ViewGroup.LayoutParams)pic_ic.getLayoutParams();//获取你要填充图片的布局的layoutParam
|
||||
// //因为是2列,所以宽度是屏幕的一半,高度是根据bitmap的高/宽*屏幕宽的一半
|
||||
// layoutParams.width = (ScreenUtils.getScreenWidth()- AdaptScreenUtils.pt2Px(0)) / 2;//这个是布局的宽度
|
||||
//
|
||||
// layoutParams.height = (int) ((float) bitmap.getHeight() / (float) bitmap.getWidth() * layoutParams.width- AdaptScreenUtils.pt2Px(5) );
|
||||
//
|
||||
// pic_ic.setLayoutParams(layoutParams);//容器的宽高设置好了
|
||||
// // 然后在改变一下bitmap的宽高
|
||||
// (pic_ic).setImageBitmap(bitmap);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
|
||||
// return false;
|
||||
// }
|
||||
// })
|
||||
// .into(new SimpleTarget<Bitmap>() {
|
||||
// public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
|
||||
// //这个bitmap就是你图片url加载得到的结果
|
||||
//// //获取bitmap信息，可赋值给外部变量操作，也可在此时行操作。
|
||||
// ViewGroup.LayoutParams layoutParams = (ViewGroup.LayoutParams)pic_ic.getLayoutParams();//获取你要填充图片的布局的layoutParam
|
||||
// //因为是2列,所以宽度是屏幕的一半,高度是根据bitmap的高/宽*屏幕宽的一半
|
||||
// layoutParams.width = (ScreenUtils.getScreenWidth()- AdaptScreenUtils.pt2Px(0)) / 2;//这个是布局的宽度
|
||||
//
|
||||
// layoutParams.height = (int) ((float) bitmap.getHeight() / (float) bitmap.getWidth() * layoutParams.width- AdaptScreenUtils.pt2Px(5) );
|
||||
//
|
||||
// pic_ic.setLayoutParams(layoutParams);//容器的宽高设置好了
|
||||
// // 然后在改变一下bitmap的宽高
|
||||
// (pic_ic).setImageBitmap(bitmap);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// });
|
||||
//
|
||||
// }catch (Exception e){
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
Glide.with(getActivity())
|
||||
.load(s.replace("/pic_output/", "/pic_input/"))
|
||||
.load(s)
|
||||
.placeholder(R.mipmap.voom_none_img)
|
||||
.error(R.mipmap.voom_none_img)
|
||||
// .listener(new RequestListener<Drawable>() {
|
||||
// @Override
|
||||
// public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
|
||||
// try {
|
||||
// Glide.with(getActivity())
|
||||
// .load(s.replace("/pic_output/", "/pic_input/"))
|
||||
// .placeholder(R.mipmap.voom_none_img)
|
||||
// .error(R.mipmap.voom_none_img)
|
||||
// .into(pic_ic);
|
||||
// }catch (Exception ee){
|
||||
//
|
||||
// }
|
||||
//
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
|
||||
// return false;
|
||||
// }
|
||||
// })
|
||||
.into(pic_ic);
|
||||
}
|
||||
|
||||
@@ -542,9 +437,9 @@ public class CircleFragment1 extends BaseFragment {
|
||||
}
|
||||
|
||||
private void changeView() {
|
||||
if(skeletonScreen!=null) {
|
||||
skeletonScreen.hide();
|
||||
}
|
||||
// if(skeletonScreen!=null) {
|
||||
// skeletonScreen.hide();
|
||||
// }
|
||||
if (titles == null || titles.size() == 0) {
|
||||
if(binding.emtryLy.getVisibility() == View.GONE) {
|
||||
binding.emtryLy.setVisibility(View.VISIBLE);
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Activity;
|
||||
@@ -25,10 +25,10 @@ import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
|
||||
|
||||
import com.amap.api.location.AMapLocation;
|
||||
import com.amap.api.location.AMapLocationClient;
|
||||
import com.amap.api.location.AMapLocationClientOption;
|
||||
import com.amap.api.location.AMapLocationListener;
|
||||
//import com.amap.api.location.AMapLocation;
|
||||
//import com.amap.api.location.AMapLocationClient;
|
||||
//import com.amap.api.location.AMapLocationClientOption;
|
||||
//import com.amap.api.location.AMapLocationListener;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.DataSource;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
@@ -39,28 +39,28 @@ import com.bumptech.glide.request.target.ImageViewTarget;
|
||||
import com.bumptech.glide.request.target.SimpleTarget;
|
||||
import com.bumptech.glide.request.target.Target;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentCircleBinding;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.ApiService;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AdaptScreenUtils;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.utils.ScreenUtils;
|
||||
import com.dskj.rbchat.voom.TiktokActivity;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.ethanhua.skeleton.Skeleton;
|
||||
import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentCircleBinding;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.RxBusLoadMoreListBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AdaptScreenUtils;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.utils.ScreenUtils;
|
||||
import com.hbl.lewan.voom.TiktokActivity;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
//import com.ethanhua.skeleton.Skeleton;
|
||||
//import com.ethanhua.skeleton.SkeletonScreen;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
@@ -82,20 +82,20 @@ import rx.schedulers.Schedulers;
|
||||
public class CircleFragment2 extends BaseFragment {
|
||||
private FragmentCircleBinding binding;
|
||||
|
||||
AMapLocation aMapLocation;
|
||||
//声明AMapLocationClientOption对象
|
||||
public AMapLocationClientOption mLocationOption = null;
|
||||
//声明AMapLocationClient类对象
|
||||
public AMapLocationClient mLocationClient = null;
|
||||
//声明定位回调监听器
|
||||
public AMapLocationListener mLocationListener;
|
||||
// AMapLocation aMapLocation;
|
||||
// //声明AMapLocationClientOption对象
|
||||
// public AMapLocationClientOption mLocationOption = null;
|
||||
// //声明AMapLocationClient类对象
|
||||
// public AMapLocationClient mLocationClient = null;
|
||||
// //声明定位回调监听器
|
||||
// public AMapLocationListener mLocationListener;
|
||||
|
||||
public static List<AlbumBean> titles = new ArrayList<>();
|
||||
static CommonAdapter commonAdapter;
|
||||
private int categoryId;
|
||||
StaggeredGridLayoutManager linearLayoutManager;
|
||||
protected ActivityResultLauncher<String[]> permissionLauncher;
|
||||
SkeletonScreen skeletonScreen;
|
||||
// SkeletonScreen skeletonScreen;
|
||||
|
||||
public static void changeBean(AlbumBean albumBean,int pos){
|
||||
if(titles.size()>pos){
|
||||
@@ -105,15 +105,15 @@ public class CircleFragment2 extends BaseFragment {
|
||||
}
|
||||
|
||||
private void initShowSkeleton() {
|
||||
skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
.adapter(commonAdapter)
|
||||
.load(R.layout.discover_child_item_default)
|
||||
.shimmer(true) // whether show shimmer animation. default is true
|
||||
.count(10) // the recycler view item count. default is 10
|
||||
.color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
.angle(20) // the shimmer angle. default is 20;
|
||||
.duration(1500) // the shimmer animation duration. default is 1000;
|
||||
.frozen(false).show();
|
||||
// skeletonScreen = Skeleton.bind(binding.recyclerview)
|
||||
// .adapter(commonAdapter)
|
||||
// .load(R.layout.discover_child_item_default)
|
||||
// .shimmer(true) // whether show shimmer animation. default is true
|
||||
// .count(10) // the recycler view item count. default is 10
|
||||
// .color(R.color.color_white) // the shimmer color. default is #a2878787
|
||||
// .angle(20) // the shimmer angle. default is 20;
|
||||
// .duration(1500) // the shimmer animation duration. default is 1000;
|
||||
// .frozen(false).show();
|
||||
}
|
||||
|
||||
int type;
|
||||
@@ -252,62 +252,62 @@ public class CircleFragment2 extends BaseFragment {
|
||||
|
||||
private void toLocation() {
|
||||
|
||||
//设置定位回调监听
|
||||
mLocationListener = amapLocation -> {
|
||||
if (amapLocation != null) {
|
||||
if (amapLocation.getErrorCode() == 0) {
|
||||
if (aMapLocation == null) {
|
||||
aMapLocation = amapLocation;
|
||||
}
|
||||
binding.refreshLayout.setVisibility(View.VISIBLE);
|
||||
binding.dingweiRy.setVisibility(View.GONE);
|
||||
binding.refreshLayout.autoRefresh();
|
||||
//可在其中解析amapLocation获取相应内容。
|
||||
LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
|
||||
+ amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";");
|
||||
} else {
|
||||
//定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
|
||||
|
||||
LogUtils.i("AmapError location Error, ErrCode:"
|
||||
+ amapLocation.getErrorCode() + ", errInfo:"
|
||||
+ amapLocation.getErrorInfo());
|
||||
|
||||
}
|
||||
} else {
|
||||
|
||||
LogUtils.i("定位数据为空");
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
//初始化AMapLocationClientOption对象
|
||||
mLocationOption = new AMapLocationClientOption();
|
||||
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
|
||||
mLocationOption.setOnceLocation(true);
|
||||
mLocationOption.setOnceLocationLatest(true);
|
||||
mLocationOption.setHttpTimeOut(20000);
|
||||
mLocationOption.setLocationCacheEnable(false);
|
||||
|
||||
//初始化定位
|
||||
try {
|
||||
mLocationClient = new AMapLocationClient(getActivity());
|
||||
mLocationClient.setLocationOption(mLocationOption);
|
||||
mLocationClient.setLocationListener(mLocationListener);
|
||||
mLocationClient.startLocation();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// //设置定位回调监听
|
||||
// mLocationListener = amapLocation -> {
|
||||
// if (amapLocation != null) {
|
||||
// if (amapLocation.getErrorCode() == 0) {
|
||||
// if (aMapLocation == null) {
|
||||
// aMapLocation = amapLocation;
|
||||
// }
|
||||
// binding.refreshLayout.setVisibility(View.VISIBLE);
|
||||
// binding.dingweiRy.setVisibility(View.GONE);
|
||||
// binding.refreshLayout.autoRefresh();
|
||||
// //可在其中解析amapLocation获取相应内容。
|
||||
// LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
|
||||
// + amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";");
|
||||
// } else {
|
||||
// //定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
|
||||
//
|
||||
// LogUtils.i("AmapError location Error, ErrCode:"
|
||||
// + amapLocation.getErrorCode() + ", errInfo:"
|
||||
// + amapLocation.getErrorInfo());
|
||||
//
|
||||
// }
|
||||
// } else {
|
||||
//
|
||||
// LogUtils.i("定位数据为空");
|
||||
//
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// //初始化AMapLocationClientOption对象
|
||||
// mLocationOption = new AMapLocationClientOption();
|
||||
// mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
|
||||
// mLocationOption.setOnceLocation(true);
|
||||
// mLocationOption.setOnceLocationLatest(true);
|
||||
// mLocationOption.setHttpTimeOut(20000);
|
||||
// mLocationOption.setLocationCacheEnable(false);
|
||||
//
|
||||
// //初始化定位
|
||||
// try {
|
||||
// mLocationClient = new AMapLocationClient(getActivity());
|
||||
// mLocationClient.setLocationOption(mLocationOption);
|
||||
// mLocationClient.setLocationListener(mLocationListener);
|
||||
// mLocationClient.startLocation();
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void initLocation() {
|
||||
if (aMapLocation != null) {
|
||||
getDateList();
|
||||
} else {
|
||||
LogUtils.i("111111111111111111");
|
||||
showLoc();
|
||||
}
|
||||
// if (aMapLocation != null) {
|
||||
// getDateList();
|
||||
// } else {
|
||||
// LogUtils.i("111111111111111111");
|
||||
// showLoc();
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
@@ -437,22 +437,8 @@ public class CircleFragment2 extends BaseFragment {
|
||||
if (s.getType() == 1) {
|
||||
if(!TextUtils.isEmpty(s.getPicture1())) {
|
||||
if (s.getPicture1().startsWith("http")) {
|
||||
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
|
||||
// Glide.with(getActivity())
|
||||
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
|
||||
// .apply(requestOptions).into(pic_ic);
|
||||
toUrl(holder,s.getPicture1().replace("/pic_output/", "/pic_input/"));
|
||||
} 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);
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
@@ -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
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
/**
|
||||
* 作者：created by Jarchie
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
/**
|
||||
* Created by 钉某人
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import static android.app.PendingIntent.getActivity;
|
||||
|
||||
@@ -27,20 +27,20 @@ import androidx.viewpager2.widget.ViewPager2;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.ApiService;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.voom.CircleFragment;
|
||||
import com.dskj.rbchat.voom.CirclePicFragment;
|
||||
import com.dskj.rbchat.voom.TiktokActivity;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.RxBusLoadMoreListBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.voom.CircleFragment;
|
||||
import com.hbl.lewan.voom.CirclePicFragment;
|
||||
import com.hbl.lewan.voom.TiktokActivity;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.google.android.material.tabs.TabLayoutMediator;
|
||||
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
|
||||
@@ -296,14 +296,14 @@ public class TiktokAdapter extends RecyclerView.Adapter<TiktokAdapter.ViewHolder
|
||||
url = ApiService.URL + albumBean.getVideo();
|
||||
picUrl = url;
|
||||
} else {
|
||||
picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
|
||||
picUrl = url+ "?vframe/jpg/offset/1";
|
||||
}
|
||||
Glide.with(holder.mThumb.getContext())
|
||||
.load(R.mipmap.zhifuzhong_img)
|
||||
.into(holder.mThumb);
|
||||
// long timeDa = DataUtils.dateToStamp(albumBean.getCreateTime());
|
||||
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
|
||||
url = url.replace("/video_output/", "/video_input/");
|
||||
// url = url;
|
||||
holder.mVideoView.setVideoURI(Uri.parse(url));
|
||||
// } else {
|
||||
//// url = url.replace("/video_input/", "/video_output/");
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.drawable.Drawable;
|
||||
@@ -24,20 +24,20 @@ import androidx.viewpager2.widget.ViewPager2;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.model.AlbumBean;
|
||||
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.ApiService;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.voom.CirclePicFragment;
|
||||
import com.dskj.rbchat.voom.TiktoInfokActivity;
|
||||
import com.dskj.rbchat.voom.TiktokActivityMe;
|
||||
import com.dskj.rbchat.widget.CircleImageView;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.model.AlbumBean;
|
||||
import com.hbl.lewan.model.RxBusLoadMoreListBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.voom.CirclePicFragment;
|
||||
import com.hbl.lewan.voom.TiktoInfokActivity;
|
||||
import com.hbl.lewan.voom.TiktokActivityMe;
|
||||
import com.hbl.lewan.widget.CircleImageView;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.google.android.material.tabs.TabLayoutMediator;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
@@ -274,14 +274,14 @@ public class TiktokAdapterMe extends RecyclerView.Adapter<TiktokAdapterMe.ViewHo
|
||||
url = ApiService.URL + albumBean.getVideo();
|
||||
picUrl = url;
|
||||
} else {
|
||||
picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
|
||||
picUrl = url+ "?vframe/jpg/offset/1";
|
||||
}
|
||||
Glide.with(holder.mThumb.getContext())
|
||||
.load(R.mipmap.zhifuzhong_img)
|
||||
.into(holder.mThumb);
|
||||
// long timeDa = DataUtils.dateToStamp(albumBean.getCreateTime());
|
||||
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
|
||||
url = url.replace("/video_output/", "/video_input/");
|
||||
// url = url.replace("/video_output/", "/video_input/");
|
||||
holder.mVideoView.setVideoURI(Uri.parse(url));
|
||||
// } else {
|
||||
//// url = url.replace("/video_input/", "/video_output/");
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.voom.comm;
|
||||
package com.hbl.lewan.voom.comm;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.View;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -6,21 +6,21 @@ import android.view.View;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityGiftInfoBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityWalletInfoBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.LipinDuiHuanActivity;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityGiftInfoBinding;
|
||||
import com.hbl.lewan.databinding.ActivityWalletInfoBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.LipinDuiHuanActivity;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
@@ -13,27 +13,27 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletInfo1Binding;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletInfoBinding;
|
||||
import com.dskj.rbchat.dialog.SelectTypeDialog;
|
||||
import com.dskj.rbchat.model.BillBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.StatisticsBean;
|
||||
import com.dskj.rbchat.model.TaskBean;
|
||||
import com.dskj.rbchat.model.TypeBean;
|
||||
import com.dskj.rbchat.model.WithdrawCashBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentWalletInfo1Binding;
|
||||
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
|
||||
import com.hbl.lewan.dialog.SelectTypeDialog;
|
||||
import com.hbl.lewan.model.BillBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.StatisticsBean;
|
||||
import com.hbl.lewan.model.TaskBean;
|
||||
import com.hbl.lewan.model.TypeBean;
|
||||
import com.hbl.lewan.model.WithdrawCashBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
import com.netease.nimlib.sdk.team.model.Team;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -13,18 +13,18 @@ import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
|
||||
import com.dskj.rbchat.custom.PasswordEditText;
|
||||
import com.dskj.rbchat.databinding.ActivityChangePaypasswordBinding;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.KeyboardUtil;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.custom.PasswordEditText;
|
||||
import com.hbl.lewan.databinding.ActivityChangePaypasswordBinding;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.KeyboardUtil;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
|
||||
import static com.codersun.fingerprintcompat.FingerManager.SupportResult.DEVICE_UNSUPPORTED;
|
||||
@@ -22,31 +22,31 @@ import androidx.annotation.RequiresApi;
|
||||
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
|
||||
import com.codersun.fingerprintcompat.FingerManager;
|
||||
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityCollectionAndPaymentBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityPaySettingBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.dialog.MianMiDialog;
|
||||
import com.dskj.rbchat.dialog.MianMiXieyiDialog;
|
||||
import com.dskj.rbchat.dialog.PayCashFingerDialog;
|
||||
import com.dskj.rbchat.dialog.PayDialog;
|
||||
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
|
||||
import com.dskj.rbchat.game.JsBridgeActivity;
|
||||
import com.dskj.rbchat.login.RegisterActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.TopUpBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
|
||||
import com.hbl.lewan.databinding.ActivityPaySettingBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.dialog.MianMiDialog;
|
||||
import com.hbl.lewan.dialog.MianMiXieyiDialog;
|
||||
import com.hbl.lewan.dialog.PayCashFingerDialog;
|
||||
import com.hbl.lewan.dialog.PayDialog;
|
||||
import com.hbl.lewan.dialog.SelectPayTypeDialog;
|
||||
import com.hbl.lewan.game.JsBridgeActivity;
|
||||
import com.hbl.lewan.login.RegisterActivity;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.TopUpBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
|
||||
import android.app.Activity;
|
||||
@@ -22,24 +22,24 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.RequiresApi;
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityChongzhiBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityChongzhiPayBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.login.LoginActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.CountryBean;
|
||||
import com.dskj.rbchat.model.RegisteredBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.welcome.WelcomeActivity;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityChongzhiBinding;
|
||||
import com.hbl.lewan.databinding.ActivityChongzhiPayBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.login.LoginActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.CountryBean;
|
||||
import com.hbl.lewan.model.RegisteredBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.welcome.WelcomeActivity;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Color;
|
||||
@@ -19,25 +19,25 @@ import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.blankj.utilcode.util.ToastUtils;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.ActivityTopupBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.ExchangeConfBean;
|
||||
import com.dskj.rbchat.model.InstallmentBean;
|
||||
import com.dskj.rbchat.model.SendOrderBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.ActivityTopupBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.ExchangeConfBean;
|
||||
import com.hbl.lewan.model.InstallmentBean;
|
||||
import com.hbl.lewan.model.SendOrderBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
@@ -15,24 +15,24 @@ import androidx.recyclerview.widget.GridLayoutManager;
|
||||
|
||||
import com.blankj.utilcode.util.ToastUtils;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.ActivityTopupBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityTopupResultBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.SendOrderBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.ActivityTopupBinding;
|
||||
import com.hbl.lewan.databinding.ActivityTopupResultBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.SendOrderBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -16,36 +16,36 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
||||
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.contact.UserInfoActivity;
|
||||
import com.dskj.rbchat.databinding.FragmentVoomBinding;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.game.JsBridgeActivity;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
|
||||
import com.dskj.rbchat.model.AuthorizeBean;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.GameBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.StaffServiceIdBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.voom.CircleFragment;
|
||||
import com.dskj.rbchat.voom.MessageActivity;
|
||||
import com.dskj.rbchat.voom.PushActivity;
|
||||
import com.dskj.rbchat.voom.comm.CircleFragment1;
|
||||
import com.dskj.rbchat.voom.comm.CircleFragment2;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.contact.UserInfoActivity;
|
||||
import com.hbl.lewan.databinding.FragmentVoomBinding;
|
||||
import com.hbl.lewan.databinding.FragmentWalletBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.game.JsBridgeActivity;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
|
||||
import com.hbl.lewan.model.AuthorizeBean;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.GameBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.StaffServiceIdBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.voom.CircleFragment;
|
||||
import com.hbl.lewan.voom.MessageActivity;
|
||||
import com.hbl.lewan.voom.PushActivity;
|
||||
import com.hbl.lewan.voom.comm.CircleFragment1;
|
||||
import com.hbl.lewan.voom.comm.CircleFragment2;
|
||||
import com.google.android.material.tabs.TabLayoutMediator;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -13,22 +13,22 @@ import android.view.ViewGroup;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletBfBinding;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.FragmentWalletBfBinding;
|
||||
import com.hbl.lewan.databinding.FragmentWalletBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.drawable.Drawable;
|
||||
@@ -9,23 +9,23 @@ import androidx.annotation.Nullable;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.core.graphics.drawable.DrawableCompat;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityWalletInfoBinding;
|
||||
import com.dskj.rbchat.databinding.ActivityWalletInfoNewBinding;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
|
||||
import com.dskj.rbchat.main.mine.MineFragment;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
|
||||
import com.dskj.rbchat.pay.LipinDuiHuanActivity;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityWalletInfoBinding;
|
||||
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
|
||||
import com.hbl.lewan.main.mine.MineFragment;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
|
||||
import com.hbl.lewan.pay.LipinDuiHuanActivity;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import static android.widget.RelativeLayout.END_OF;
|
||||
import static android.widget.RelativeLayout.START_OF;
|
||||
@@ -26,30 +26,30 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletInfoBinding;
|
||||
import com.dskj.rbchat.dialog.SelectTypeDialog;
|
||||
import com.dskj.rbchat.model.BillBean;
|
||||
import com.dskj.rbchat.model.BindBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.RosterElementEntity;
|
||||
import com.dskj.rbchat.model.StatisticsBean;
|
||||
import com.dskj.rbchat.model.TaskBean;
|
||||
import com.dskj.rbchat.model.TypeBean;
|
||||
import com.dskj.rbchat.model.WithdrawCashBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AppUtils;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.voom.MessageActivity;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
|
||||
import com.hbl.lewan.dialog.SelectTypeDialog;
|
||||
import com.hbl.lewan.model.BillBean;
|
||||
import com.hbl.lewan.model.BindBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.RosterElementEntity;
|
||||
import com.hbl.lewan.model.StatisticsBean;
|
||||
import com.hbl.lewan.model.TaskBean;
|
||||
import com.hbl.lewan.model.TypeBean;
|
||||
import com.hbl.lewan.model.WithdrawCashBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AppUtils;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.voom.MessageActivity;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
import com.netease.nimlib.sdk.team.model.Team;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
@@ -13,26 +13,26 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.adapter.CommonAdapter;
|
||||
import com.dskj.rbchat.adapter.ViewHolder;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletInfo1Binding;
|
||||
import com.dskj.rbchat.databinding.FragmentWalletInfoBinding;
|
||||
import com.dskj.rbchat.dialog.SelectTypeDialog;
|
||||
import com.dskj.rbchat.model.BillBean;
|
||||
import com.dskj.rbchat.model.ListBeanResult;
|
||||
import com.dskj.rbchat.model.StatisticsBean;
|
||||
import com.dskj.rbchat.model.TaskBean;
|
||||
import com.dskj.rbchat.model.TypeBean;
|
||||
import com.dskj.rbchat.model.WithdrawCashBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.adapter.CommonAdapter;
|
||||
import com.hbl.lewan.adapter.ViewHolder;
|
||||
import com.hbl.lewan.databinding.FragmentWalletInfo1Binding;
|
||||
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
|
||||
import com.hbl.lewan.dialog.SelectTypeDialog;
|
||||
import com.hbl.lewan.model.BillBean;
|
||||
import com.hbl.lewan.model.ListBeanResult;
|
||||
import com.hbl.lewan.model.StatisticsBean;
|
||||
import com.hbl.lewan.model.TaskBean;
|
||||
import com.hbl.lewan.model.TypeBean;
|
||||
import com.hbl.lewan.model.WithdrawCashBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.team.TeamService;
|
||||
import com.netease.nimlib.sdk.team.model.Team;
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.dskj.rbchat.wallet;
|
||||
package com.hbl.lewan.wallet;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityWalletInfoTbBinding;
|
||||
import com.dskj.rbchat.model.WalletBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityWalletInfoTbBinding;
|
||||
import com.hbl.lewan.model.WalletBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.utils.ToastX;
|
||||
import com.netease.yunxin.kit.corekit.im.IMKitClient;
|
||||
@@ -2,17 +2,17 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.welcome;
|
||||
package com.hbl.lewan.welcome;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.view.LayoutInflater;
|
||||
import androidx.annotation.Nullable;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ServerConfigActivityBinding;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ServerConfigActivityBinding;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
|
||||
import com.netease.yunxin.kit.common.ui.dialog.CommonConfirmDialog;
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
package com.dskj.rbchat.welcome;
|
||||
package com.hbl.lewan.welcome;
|
||||
|
||||
|
||||
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
|
||||
@@ -31,29 +31,31 @@ import androidx.annotation.Nullable;
|
||||
import androidx.core.view.WindowCompat;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.dskj.rbchat.IMUIKitConfig;
|
||||
import com.dskj.rbchat.dialog.ActionConfirmDialog;
|
||||
import com.dskj.rbchat.login.ChongZhiActivity;
|
||||
import com.dskj.rbchat.login.LoginActivity;
|
||||
import com.dskj.rbchat.login.PhoneLoginActivity;
|
||||
import com.dskj.rbchat.login.RegisterActivity;
|
||||
import com.dskj.rbchat.model.LoginBean;
|
||||
import com.dskj.rbchat.model.NotifyCountBean;
|
||||
import com.dskj.rbchat.network.Api;
|
||||
import com.dskj.rbchat.network.BaseObserver;
|
||||
import com.dskj.rbchat.network.Result;
|
||||
import com.dskj.rbchat.utils.AnimUtil;
|
||||
import com.dskj.rbchat.utils.GsonUtils;
|
||||
import com.dskj.rbchat.utils.LogUtils;
|
||||
import com.dskj.rbchat.wallet.PaySettingActivity;
|
||||
import com.hbl.lewan.IMUIKitConfig;
|
||||
import com.hbl.lewan.dialog.ActionConfirmDialog;
|
||||
import com.hbl.lewan.login.ChongZhiActivity;
|
||||
import com.hbl.lewan.login.LoginActivity;
|
||||
import com.hbl.lewan.login.PhoneLoginActivity;
|
||||
import com.hbl.lewan.login.RegisterActivity;
|
||||
import com.hbl.lewan.main.mine.UserHeadEditActivity;
|
||||
import com.hbl.lewan.model.LoginBean;
|
||||
import com.hbl.lewan.model.NotifyCountBean;
|
||||
import com.hbl.lewan.network.Api;
|
||||
import com.hbl.lewan.network.ApiService;
|
||||
import com.hbl.lewan.network.BaseObserver;
|
||||
import com.hbl.lewan.network.Result;
|
||||
import com.hbl.lewan.utils.AnimUtil;
|
||||
import com.hbl.lewan.utils.GsonUtils;
|
||||
import com.hbl.lewan.utils.LogUtils;
|
||||
import com.hbl.lewan.wallet.PaySettingActivity;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.auth.LoginInfo;
|
||||
import com.dskj.rbchat.IMApplication;
|
||||
import com.dskj.rbchat.R;
|
||||
import com.dskj.rbchat.databinding.ActivityWelcomeBinding;
|
||||
import com.dskj.rbchat.main.MainActivity;
|
||||
import com.dskj.rbchat.utils.Constant;
|
||||
import com.dskj.rbchat.utils.DataUtils;
|
||||
import com.hbl.lewan.IMApplication;
|
||||
import com.hbl.lewan.R;
|
||||
import com.hbl.lewan.databinding.ActivityWelcomeBinding;
|
||||
import com.hbl.lewan.main.MainActivity;
|
||||
import com.hbl.lewan.utils.Constant;
|
||||
import com.hbl.lewan.utils.DataUtils;
|
||||
import com.netease.nimlib.sdk.mixpush.MixPushService;
|
||||
import com.netease.yunxin.kit.alog.ALog;
|
||||
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
@@ -105,11 +107,11 @@ public class WelcomeActivity extends BaseActivity {
|
||||
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
|
||||
Uri uri = getIntent().getData();
|
||||
getScheme(uri);
|
||||
if (NIMClient.getService(MixPushService.class).isFCMIntent(getIntent())) {
|
||||
String json = NIMClient.getService(MixPushService.class).parseFCMPayload(getIntent());
|
||||
LogUtils.d("fcm","json=="+json);
|
||||
IMApplication.fcmpayload = json;
|
||||
}
|
||||
// if (NIMClient.getService(MixPushService.class).isFCMIntent(getIntent())) {
|
||||
// String json = NIMClient.getService(MixPushService.class).parseFCMPayload(getIntent());
|
||||
// LogUtils.d("fcm","json=="+json);
|
||||
// IMApplication.fcmpayload = json;
|
||||
// }
|
||||
// initClip();
|
||||
//activityWelcomeBinding.bigBg.setBackgroundResource(R.color.color_white);
|
||||
if (TextUtils.isEmpty(NIMClient.getCurrentAccount())) {
|
||||
@@ -148,9 +150,16 @@ public class WelcomeActivity extends BaseActivity {
|
||||
|
||||
private void showIsLogin(boolean isLogin) {
|
||||
|
||||
//加载动画
|
||||
activityWelcomeBinding.lottieView.setAnimation(R.raw.loading);
|
||||
activityWelcomeBinding.lottieView.playAnimation();
|
||||
// if(ApiService.AREA_CODE.equals("+86")) {
|
||||
// //加载动画
|
||||
// activityWelcomeBinding.lottieView.setVisibility(View.VISIBLE);
|
||||
// activityWelcomeBinding.lottieView1.setVisibility(View.GONE);
|
||||
// activityWelcomeBinding.lottieView.setAnimation(R.raw.loading);
|
||||
// activityWelcomeBinding.lottieView.playAnimation();
|
||||
// }else{
|
||||
// activityWelcomeBinding.lottieView.setVisibility(View.GONE);
|
||||
activityWelcomeBinding.lottieView1.setVisibility(View.VISIBLE);
|
||||
// }
|
||||
|
||||
// getWindow().setBackgroundDrawableResource(com.netease.yunxin.nertc.ui.R.color.white);
|
||||
//// if (isLogin) {
|
||||
@@ -224,7 +233,7 @@ public class WelcomeActivity extends BaseActivity {
|
||||
// 访问路劲
|
||||
String path = uri.getPath();
|
||||
//获取指定参数值
|
||||
if (scheme.equals("timego") && host.equals("time_go_chat")) {
|
||||
if (scheme.equals("timego") && host.equals("time_go_mm")) {
|
||||
if (path.contains("add_user")) {
|
||||
String goodsId = uri.getQueryParameter("userId");
|
||||
LogUtils.i("111111111userId: " + goodsId);
|
||||
@@ -286,7 +295,7 @@ public class WelcomeActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
private void showMainActivityAndFinish() {
|
||||
activityWelcomeBinding.lottieView.cancelAnimation();
|
||||
// activityWelcomeBinding.lottieView.cancelAnimation();
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
|
||||
Intent intent = new Intent();
|
||||
intent.setClass(this, MainActivity.class);
|
||||
@@ -342,7 +351,16 @@ public class WelcomeActivity extends BaseActivity {
|
||||
loginBean.setSilverFeeRate(feedbackResp.data.getSilverFeeRate());
|
||||
loginBean.setMmSilverFeeRate(feedbackResp.data.getMmSilverFeeRate());
|
||||
DataUtils.set(WelcomeActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
|
||||
|
||||
|
||||
new Handler().postDelayed(() -> loginIM(account, token), 3000);
|
||||
// new Handler().postDelayed(() -> showMainActivityAndFinish(), 3000);
|
||||
// showMainActivityAndFinish()
|
||||
// new Handler().postDelayed(() -> {
|
||||
// Intent intent = new Intent(WelcomeActivity.this, UserHeadEditActivity.class);
|
||||
// intent.putExtra("start",true);
|
||||
// startActivity(intent);
|
||||
// }, 6000);
|
||||
|
||||
}
|
||||
|
||||
@@ -396,8 +414,8 @@ public class WelcomeActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
private void loginIM(String account, String token) {
|
||||
|
||||
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
LoginInfo loginInfo =
|
||||
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
|
||||
.withAppKey(DataUtils.readAppKey(this))
|
||||
@@ -407,6 +425,8 @@ public class WelcomeActivity extends BaseActivity {
|
||||
new LoginCallback<LoginInfo>() {
|
||||
@Override
|
||||
public void onError(int errorCode, @NonNull String errorMsg) {
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
|
||||
ToastX.showShortToast(
|
||||
String.format(getResources().getString(R.string.login_fail), errorCode));
|
||||
launchLoginPage();
|
||||
@@ -414,6 +434,13 @@ public class WelcomeActivity extends BaseActivity {
|
||||
|
||||
@Override
|
||||
public void onSuccess(@Nullable LoginInfo data) {
|
||||
DataUtils.set(WelcomeActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
|
||||
DataUtils.set(WelcomeActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
|
||||
|
||||
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
|
||||
DataUtils.set(WelcomeActivity.this,"last_login_time",System.currentTimeMillis());
|
||||
|
||||
|
||||
showMainActivityAndFinish();
|
||||
// IMApplication.getInstance().toLogin();
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.widget;
|
||||
package com.hbl.lewan.widget;
|
||||
|
||||
|
||||
import android.animation.ValueAnimator;
|
||||
@@ -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 {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.widget;
|
||||
package com.hbl.lewan.widget;
|
||||
|
||||
import android.graphics.Rect;
|
||||
import android.view.View;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.widget;
|
||||
package com.hbl.lewan.widget;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
62
app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
Normal file
62
app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
Normal file
@@ -0,0 +1,62 @@
|
||||
//package com.hbl.lewan.wxapi;
|
||||
//
|
||||
//import android.app.Activity;
|
||||
//import android.content.Intent;
|
||||
//import android.os.Bundle;
|
||||
//import android.util.Log;
|
||||
//
|
||||
//import com.hbl.lewan.IMUIKitConfig;
|
||||
//import com.hbl.lewan.wxapi.bean.WeiXin;
|
||||
//import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
|
||||
//import com.tencent.mm.opensdk.constants.ConstantsAPI;
|
||||
//import com.tencent.mm.opensdk.modelbase.BaseReq;
|
||||
//import com.tencent.mm.opensdk.modelbase.BaseResp;
|
||||
//import com.tencent.mm.opensdk.modelmsg.SendAuth;
|
||||
//import com.tencent.mm.opensdk.openapi.IWXAPI;
|
||||
//import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
|
||||
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
|
||||
//
|
||||
///**
|
||||
// * 微信登陆分享回调Activity
|
||||
// * @create time 2015-05-25
|
||||
// */
|
||||
//public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
|
||||
// private IWXAPI wxAPI;
|
||||
//
|
||||
// @Override
|
||||
// protected void onCreate(Bundle savedInstanceState) {
|
||||
// super.onCreate(savedInstanceState);
|
||||
//
|
||||
// wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID,true);
|
||||
// wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
|
||||
// wxAPI.handleIntent(getIntent(), this);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// protected void onNewIntent(Intent intent){
|
||||
// super.onNewIntent(intent);
|
||||
// wxAPI.handleIntent(getIntent(),this);
|
||||
// Log.i("ansen","WXEntryActivity onNewIntent");
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onReq(BaseReq arg0) {
|
||||
// Log.i("ansen","WXEntryActivity onReq:"+arg0);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onResp(BaseResp resp){
|
||||
// if(resp.getType()== ConstantsAPI.COMMAND_SENDMESSAGE_TO_WX){//分享
|
||||
// Log.i("ansen","微信分享操作.....");
|
||||
// WeiXin weiXin=new WeiXin(2,resp.errCode,"");
|
||||
// RxBus.getInstance().post(weiXin);
|
||||
// }else if(resp.getType()==ConstantsAPI.COMMAND_SENDAUTH){//登陆
|
||||
// Log.i("ansen", "微信登录操作.....");
|
||||
// SendAuth.Resp authResp = (SendAuth.Resp) resp;
|
||||
// WeiXin weiXin=new WeiXin(1,resp.errCode,authResp.code);
|
||||
// RxBus.getInstance().post(weiXin);
|
||||
// }
|
||||
// finish();
|
||||
// }
|
||||
//
|
||||
//}
|
||||
@@ -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();
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wxapi.bean;
|
||||
package com.hbl.lewan.wxapi.bean;
|
||||
|
||||
/**
|
||||
* @create time 2017-09-14
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wxapi.bean;
|
||||
package com.hbl.lewan.wxapi.bean;
|
||||
|
||||
/**
|
||||
* @create time 2017-09-14
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dskj.rbchat.wxapi.bean;
|
||||
package com.hbl.lewan.wxapi.bean;
|
||||
|
||||
/**
|
||||
* Created by xx on 16/6/25.
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user