This commit is contained in:
18142669586
2022-07-26 17:45:20 +08:00
parent 021429a60d
commit a4153da415
33 changed files with 477 additions and 57 deletions

View File

@@ -26,6 +26,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.viewpager.widget.ViewPager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.android.billingclient.api.Purchase;
@@ -65,6 +66,7 @@ import com.yunbao.common.utils.GoogleBillingUtil;
import com.yunbao.common.utils.LocationUtil;
import com.yunbao.common.utils.OnGoogleBillingListener;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.VersionUtil;
@@ -112,6 +114,7 @@ import io.rong.imlib.RongIMClient;
import static com.yunbao.common.CommonAppContext.isReady;
@Route(path = RouteUtil.PATH_MAIN)
public class MainActivity extends AbsActivity implements MainAppBarLayoutListener {
public static RelativeLayout rt_main_tab;
@@ -576,7 +579,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
super.onResume();
if (mFristLoad) {
mFristLoad = false;
getLocation();
// getLocation();
loadPageData(0, false);
if (mHomeLiveViewHolder != null) {
mHomeLiveViewHolder.setShowed(true);

View File

@@ -39,7 +39,7 @@ public class OneLoginActivity extends AbsActivity {
EditText edit_user,edit_code;
Button btn_enter;
public static OneLoginActivity act;
@Override
protected int getLayoutId() {
@@ -65,6 +65,7 @@ public class OneLoginActivity extends AbsActivity {
@Override
protected void main() {
super.main();
act = this;
avatar = (RoundedImageView)findViewById(R.id.avatar);
edit_user = (EditText)findViewById(R.id.edit_user);
edit_code = (EditText)findViewById(R.id.edit_code);

View File

@@ -22,6 +22,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.LiveAudienceActivity;
@@ -31,6 +32,7 @@ import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.main.R;
import com.yunbao.main.activity.EntryActivity;
import com.yunbao.main.activity.MainActivity;
import com.yunbao.main.activity.OneLoginActivity;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
@@ -118,12 +120,16 @@ public class OneLoginDialog extends AbsDialogFragment {
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
dismiss();
if (info[0]!=null) {
JSONObject obj = JSON.parseObject(info[0]);
CommonAppConfig.isNewUser = true;
MainActivity.forward(getContext(), false);
gotoLive(obj.getString("anchor_id"));
IMLoginManager.get(mContext).setisNewUserOne(true);
// OneLoginActivity.act.finish();
}else{
MainActivity.forward(getContext(), false);
// OneLoginActivity.act.finish();
}
}
});