优化视觉:第三方登录点击后弹出loading
更新svga库
This commit is contained in:
@@ -900,4 +900,5 @@ Limited ride And limited avatar frame</string>
|
|||||||
<string name="king">国王</string>
|
<string name="king">国王</string>
|
||||||
<string name="emperor">皇帝</string>
|
<string name="emperor">皇帝</string>
|
||||||
<string name="better_emperor">超皇</string>
|
<string name="better_emperor">超皇</string>
|
||||||
|
<string name="login_wait">Please wait...</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -914,6 +914,7 @@
|
|||||||
<string name="login_invalid">登錄失效,請重新登錄</string>
|
<string name="login_invalid">登錄失效,請重新登錄</string>
|
||||||
<string name="slide_settings">滑動設置</string>
|
<string name="slide_settings">滑動設置</string>
|
||||||
<string name="up_slide_settings">上下滑動切換直播間</string>
|
<string name="up_slide_settings">上下滑動切換直播間</string>
|
||||||
|
<string name="login_wait">請稍後</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Binary file not shown.
BIN
libs/svgaplayer-release-v1.2.aar
Normal file
BIN
libs/svgaplayer-release-v1.2.aar
Normal file
Binary file not shown.
@@ -1 +1 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
@@ -66,7 +66,7 @@ dependencies {
|
|||||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
compileOnly files('../libs/beautysdk-202202241203.aar')
|
compileOnly files('../libs/beautysdk-202202241203.aar')
|
||||||
compileOnly files('../libs/svgaplayer-release-v1.1.aar')
|
compileOnly files('../libs/svgaplayer-release-v1.2.aar')
|
||||||
//直播
|
//直播
|
||||||
api project(':live')
|
api project(':live')
|
||||||
//短视频
|
//短视频
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
|
|||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
|
import android.app.Dialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
@@ -86,8 +87,10 @@ import com.yunbao.common.interfaces.CommonCallback;
|
|||||||
import com.yunbao.common.manager.IMLoginManager;
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.manager.NoviceInstructorManager;
|
import com.yunbao.common.manager.NoviceInstructorManager;
|
||||||
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
||||||
|
import com.yunbao.common.utils.DialogUitl;
|
||||||
import com.yunbao.common.utils.RouteUtil;
|
import com.yunbao.common.utils.RouteUtil;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
|
import com.yunbao.common.utils.WordUtil;
|
||||||
import com.yunbao.live.activity.LiveAudienceActivity;
|
import com.yunbao.live.activity.LiveAudienceActivity;
|
||||||
import com.yunbao.live.bean.LiveBean;
|
import com.yunbao.live.bean.LiveBean;
|
||||||
import com.yunbao.live.http.LiveHttpUtil;
|
import com.yunbao.live.http.LiveHttpUtil;
|
||||||
@@ -129,6 +132,7 @@ public class EntryActivity extends AppCompatActivity {
|
|||||||
private LinearLayout lt_btn_twitter, lt_btn_facebook, lt_customer;
|
private LinearLayout lt_btn_twitter, lt_btn_facebook, lt_customer;
|
||||||
private String kefuUrl = "";
|
private String kefuUrl = "";
|
||||||
private boolean mBtnClick = false;
|
private boolean mBtnClick = false;
|
||||||
|
private Dialog loginLoadingDialog;
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
public void close(String str) {
|
public void close(String str) {
|
||||||
@@ -180,7 +184,6 @@ public class EntryActivity extends AppCompatActivity {
|
|||||||
IMLoginManager.get(this).logout();
|
IMLoginManager.get(this).logout();
|
||||||
ToastUtil.show(R.string.login_invalid);
|
ToastUtil.show(R.string.login_invalid);
|
||||||
}
|
}
|
||||||
|
|
||||||
Get_hash_key();
|
Get_hash_key();
|
||||||
activity = this;
|
activity = this;
|
||||||
Contexts = this;
|
Contexts = this;
|
||||||
@@ -878,10 +881,16 @@ public class EntryActivity extends AppCompatActivity {
|
|||||||
if(mBtnClick){
|
if(mBtnClick){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
loginLoadingDialog = DialogUitl.loadingDialog(EntryActivity.this, WordUtil.getString(R.string.login_wait));
|
||||||
|
loginLoadingDialog.show();
|
||||||
new Timer().schedule(new TimerTask() {
|
new Timer().schedule(new TimerTask() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
mBtnClick = false;
|
mBtnClick = false;
|
||||||
|
if(loginLoadingDialog!=null){
|
||||||
|
loginLoadingDialog.dismiss();
|
||||||
|
loginLoadingDialog=null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
mBtnClick = true;
|
mBtnClick = true;
|
||||||
@@ -893,5 +902,16 @@ public class EntryActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
return mBtnClick;
|
return mBtnClick;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
if(loginLoadingDialog!=null){
|
||||||
|
if(loginLoadingDialog.isShowing()){
|
||||||
|
loginLoadingDialog.dismiss();
|
||||||
|
}
|
||||||
|
loginLoadingDialog=null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user