diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8ef3b87..9297d40 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:theme="@style/Theme.HearthyClients"> + android:value="7beba04fc2b34330900b0438639aca58" /> - 专家端 + 健康油我专家端 健康专家库 diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt index 62faa85..c7bc411 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt @@ -5,6 +5,7 @@ import android.content.res.Resources import android.os.Bundle import android.view.View import android.widget.TextView +import android.widget.Toast import androidx.appcompat.app.ActionBar import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar @@ -21,6 +22,7 @@ import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_SHOW import com.btpj.lib_base.event.LoginEvent import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.ext.showLoading +import com.btpj.lib_base.utils.CustomToast import com.btpj.lib_base.utils.LogUtil import com.btpj.lib_base.utils.StatusBarUtil import com.btpj.lib_base.utils.ToastUtil diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/CustomToast.java b/lib_base/src/main/java/com/btpj/lib_base/utils/CustomToast.java new file mode 100644 index 0000000..158d4cb --- /dev/null +++ b/lib_base/src/main/java/com/btpj/lib_base/utils/CustomToast.java @@ -0,0 +1,108 @@ +package com.btpj.lib_base.utils; + +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.view.Gravity; +import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + +import com.btpj.lib_base.R; + + +/** + * 自定义弹出对话框 + * + * @author wyy + */ +public class CustomToast extends Toast { + + private TextView textView; + private static String mText = ""; + private View view; + private int time; + private Context context; + private Drawable drawable; + private static CustomToast result; + + public CustomToast(Context context, String text, int time) { + super(context); + this.context = context; + this.mText = text; + this.time = time; + init(); + } + + public CustomToast(Context context, String text, int time, Drawable drawable) { + super(context); + this.context = context; + this.mText = text; + this.time = time; + this.drawable=drawable; + init(); + } + public CustomToast(Context context, String text, int time, int gravity ) { + super(context); + this.context = context; + this.mText = text; + this.time = time; + init2(gravity); + } + + private void init() { + try { + view = View.inflate(context, R.layout.custom_toast, null); + setView(view); + textView = (TextView) view.findViewById(R.id.textView); + textView.setText(mText); + if (drawable!=null) { + textView.setCompoundDrawables(null,drawable,null,null); + } + setGravity(Gravity.CENTER, 0, -100); + setDuration(time); + } catch (Exception e) { + + } + } + private void init2(int gravity) { + try { + view = View.inflate(context, R.layout.custom_toast, null); + setView(view); + textView = (TextView) view.findViewById(R.id.textView); + textView.setText(mText); + textView.setGravity(gravity); + if (drawable!=null) { + textView.setCompoundDrawables(null,drawable,null,null); + } + setGravity(Gravity.CENTER, 0, -100); + setDuration(time); + } catch (Exception e) { + + } + } + + + public static CustomToast makeText(Context context, CharSequence text, int duration,int gravity) { + if (result == null || !mText.equals(text) ) { + result = new CustomToast(context, text.toString(), duration,gravity); + } + return result; + } + public static CustomToast makeText(Context context, CharSequence text, int duration) { + if (result == null || !mText.equals(text) ) { + result = new CustomToast(context, text.toString(), duration); + } + return result; + } + + public static CustomToast makeText(Context context, CharSequence text, int duration, Drawable drawable) { + if (result == null || !mText.equals(text) ) { + result = new CustomToast(context, text.toString(), duration,drawable); + } + return result; + } + + public static void reset(){ + result=null; + } +} diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt index bc1902f..7e40f33 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt @@ -23,7 +23,9 @@ object ToastUtil { if(msg.isNullOrEmpty()){ return } - Toast.makeText(context.applicationContext, msg, Toast.LENGTH_SHORT).show() +// Toast.makeText(context.applicationContext, msg, Toast.LENGTH_SHORT).show() + CustomToast.makeText(context,msg,Toast.LENGTH_SHORT).show() + } fun showShort(context: Context, @StringRes resId: Int) { Toast.makeText(context.applicationContext, resId, Toast.LENGTH_SHORT).show() diff --git a/lib_base/src/main/res/layout/custom_toast.xml b/lib_base/src/main/res/layout/custom_toast.xml new file mode 100644 index 0000000..346b7bd --- /dev/null +++ b/lib_base/src/main/res/layout/custom_toast.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png index cb7b776..68bb06f 100644 Binary files a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png differ diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java index b051909..87feddf 100644 --- a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java +++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java @@ -17,7 +17,7 @@ import com.tencent.qcloud.tuikit.tuichat.util.StringUtils; * */ public class LocationMessageHolder extends MessageContentHolder { MessageAdapterContentLocationBinding mBinding; - String mapKey = "9e4aac9a04b8296e9039adce3b472f28"; + String mapKey = "7583ea1d558307d4e476cd205339c4ae"; String priKey = "4985aa1abb49ce2daa20d032a374eb58"; public LocationMessageHolder(View itemView) { super(itemView);