v1.0-2
修复支付链接问题 修复动态进个人主页无法聊一聊问题 修复支付页面【充值未到账】位置错误问题
This commit is contained in:
parent
526e05f554
commit
ec195fe0eb
@ -281,6 +281,9 @@
|
|||||||
<meta-data
|
<meta-data
|
||||||
android:name="SERVER_HOST"
|
android:name="SERVER_HOST"
|
||||||
android:value="${otoServerHost}" />
|
android:value="${otoServerHost}" />
|
||||||
|
<meta-data
|
||||||
|
android:name="IS_GOOGLE_PLAY"
|
||||||
|
android:value="${isGooglePlay}" />
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.facebook.sdk.ApplicationId"
|
android:name="com.facebook.sdk.ApplicationId"
|
||||||
android:value="@string/facebook_app_id" />
|
android:value="@string/facebook_app_id" />
|
||||||
|
@ -6,6 +6,7 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
@ -114,7 +115,8 @@ public class LauncherActivity extends AbsOTOActivity implements View.OnClickList
|
|||||||
mBtnSkipVideo = findViewById(R.id.btn_skip_video);
|
mBtnSkipVideo = findViewById(R.id.btn_skip_video);
|
||||||
mBtnSkipImage.setOnClickListener(this);
|
mBtnSkipImage.setOnClickListener(this);
|
||||||
mBtnSkipVideo.setOnClickListener(this);
|
mBtnSkipVideo.setOnClickListener(this);
|
||||||
ImgLoader.display(mContext, R.mipmap.screen, mCover);
|
//ImgLoader.display(mContext, R.mipmap.screen, mCover);
|
||||||
|
mCover.setBackgroundColor(Color.WHITE);
|
||||||
mHandler = new Handler() {
|
mHandler = new Handler() {
|
||||||
@Override
|
@Override
|
||||||
public void handleMessage(Message msg) {
|
public void handleMessage(Message msg) {
|
||||||
@ -128,7 +130,7 @@ public class LauncherActivity extends AbsOTOActivity implements View.OnClickList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
mHandler.sendEmptyMessageDelayed(WHAT_GET_CONFIG, 1000);
|
mHandler.sendEmptyMessageDelayed(WHAT_GET_CONFIG, 10);
|
||||||
LogUtil.uploadErrorLog(sInstance);
|
LogUtil.uploadErrorLog(sInstance);
|
||||||
SpUtil.getInstance().setBooleanValue("NOTIFICATION", NotificationManagerCompat.from(this).areNotificationsEnabled());
|
SpUtil.getInstance().setBooleanValue("NOTIFICATION", NotificationManagerCompat.from(this).areNotificationsEnabled());
|
||||||
}
|
}
|
||||||
|
@ -19,16 +19,23 @@ import android.webkit.WebView;
|
|||||||
import android.webkit.WebViewClient;
|
import android.webkit.WebViewClient;
|
||||||
|
|
||||||
import com.shayu.onetoone.R;
|
import com.shayu.onetoone.R;
|
||||||
|
import com.shayu.onetoone.utils.ConversationUtils;
|
||||||
import com.shayu.onetoone.utils.UserManager;
|
import com.shayu.onetoone.utils.UserManager;
|
||||||
import com.yunbao.common.CommonAppConfig;
|
import com.yunbao.common.CommonAppConfig;
|
||||||
import com.yunbao.common.Constants;
|
import com.yunbao.common.Constants;
|
||||||
import com.yunbao.common.bean.IMLoginModel;
|
import com.yunbao.common.bean.IMLoginModel;
|
||||||
|
import com.yunbao.common.event.JavascriptInterfaceEvent;
|
||||||
import com.yunbao.common.manager.IMLoginManager;
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.utils.AndroidBug5497Workaround;
|
import com.yunbao.common.utils.AndroidBug5497Workaround;
|
||||||
|
import com.yunbao.common.utils.Bus;
|
||||||
import com.yunbao.common.utils.JavascriptInterfaceUtils;
|
import com.yunbao.common.utils.JavascriptInterfaceUtils;
|
||||||
import com.yunbao.common.utils.L;
|
import com.yunbao.common.utils.L;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
import com.yunbao.common.utils.WordUtil;
|
import com.yunbao.common.utils.WordUtil;
|
||||||
|
import com.yunbao.share.ui.InvitePopDialog;
|
||||||
|
|
||||||
|
import org.greenrobot.eventbus.Subscribe;
|
||||||
|
import org.greenrobot.eventbus.ThreadMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 动态主页面
|
* 动态主页面
|
||||||
@ -36,8 +43,15 @@ import com.yunbao.common.utils.WordUtil;
|
|||||||
public class DynamicFragment extends BaseFragment {
|
public class DynamicFragment extends BaseFragment {
|
||||||
private WebView webView;
|
private WebView webView;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
Bus.getOff(this);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initView(View itemView) {
|
public void initView(View itemView) {
|
||||||
|
Bus.getOn(this);
|
||||||
webView = itemView.findViewById(R.id.webView);
|
webView = itemView.findViewById(R.id.webView);
|
||||||
WebSettings settings = webView.getSettings();
|
WebSettings settings = webView.getSettings();
|
||||||
settings.setJavaScriptEnabled(true); // 是否开启JS支持
|
settings.setJavaScriptEnabled(true); // 是否开启JS支持
|
||||||
@ -99,4 +113,15 @@ public class DynamicFragment extends BaseFragment {
|
|||||||
public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
return inflater.inflate(R.layout.fragment_dynamic, container, false);
|
return inflater.inflate(R.layout.fragment_dynamic, container, false);
|
||||||
}
|
}
|
||||||
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
|
public void event(JavascriptInterfaceEvent event) {
|
||||||
|
if (event.getMethod().equals("androidInviteShare")) {
|
||||||
|
new InvitePopDialog(mContext)
|
||||||
|
.setTitle("快來認識更多有趣的朋友吧!")
|
||||||
|
.setUrl(event.getData())
|
||||||
|
.showDialog();
|
||||||
|
} else if (event.getMethod().equals("androidCallChat")) {
|
||||||
|
ConversationUtils.startConversation(mContext, event.getData());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ public class MyWalletActivity extends AbsActivity {
|
|||||||
if(getPackageName().equals("com.pdlive.shayu")) {
|
if(getPackageName().equals("com.pdlive.shayu")) {
|
||||||
findViewById(R.id.redPacketMain).setVisibility(View.VISIBLE);
|
findViewById(R.id.redPacketMain).setVisibility(View.VISIBLE);
|
||||||
}else{
|
}else{
|
||||||
findViewById(R.id.redPacketMain).setVisibility(View.GONE);
|
findViewById(R.id.redPacketMain).setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
findViewById(R.id.redPacketMain).setOnClickListener(v -> {
|
findViewById(R.id.redPacketMain).setOnClickListener(v -> {
|
||||||
RouteUtil.forwardRedPacketList();
|
RouteUtil.forwardRedPacketList();
|
||||||
|
@ -6,7 +6,7 @@ ext {
|
|||||||
targetSdkVersion : 33,
|
targetSdkVersion : 33,
|
||||||
versionCode : 445,
|
versionCode : 445,
|
||||||
versionName : "6.5.4",
|
versionName : "6.5.4",
|
||||||
otoversionCode : 1,
|
otoversionCode : 2,
|
||||||
otoversionName : "1.0"
|
otoversionName : "1.0"
|
||||||
]
|
]
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user