Skip to content

L
LuckyFarm
Commit 834a3929 authored by wangxuewei's avatar wangxuewei
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：幸福农场
[实现方案] ：luckyfarm_1.0.3
parent 26a14caf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 351 deletions
app/src/main/java/com/ym/game/GameActivity.kt
View file @ 834a3929
......@@ -128,8 +128,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
/**
* 跳转提现页
*/
fun gotoWithdrawPage() {
JumpUtils.h5Jump("跳转提现页", Constant.Param.WithDraw, false,act)
fun gotoWithdrawPage(type: Int) {
if(type==1){
JumpUtils.h5Jump("跳转提现页", Constant.Param.WithDraw2, false,act)
}else{
JumpUtils.h5Jump("跳转提现页", Constant.Param.WithDraw, false,act)
}
}
/**
......
app/src/main/java/com/ym/game/activity/WxLoginActivity.kt
View file @ 834a3929
......@@ -113,7 +113,7 @@ class WxLoginActivity : BaseActivity(), WxImplUtils.IWxLoginCallback {
}
override fun onWxSuccess(token: String?, openid: String?) {
onEvent("login_success", "登录成功")
onEvent("login_wx", "登录成功")
startActivity(
Intent(this@WxLoginActivity, GameActivity::class.java)
)
......
app/src/main/java/com/ym/game/adapter/GameOrderListAdapter.kt
View file @ 834a3929
......@@ -23,7 +23,6 @@ class GameOrderListAdapter :
holder.item_name?.text = orderBean.name
var currPos = orderBean.ownNum/orderBean.targetNum.toFloat()
holder.item_progress?.progress=(currPos * 100).toInt()
Log.d("wxw","orderBean.ownNum%orderBean.targetNum"+orderBean.ownNum%orderBean.targetNum)
holder.item_desc?.text="${orderBean.ownNum}/${orderBean.targetNum}"
}
......
app/version.properties
View file @ 834a3929
PACKAGE_NAME=com.ym.xync
VERSION_CODE=3
VERSION_NAME=1.0.2
\ No newline at end of file
VERSION_CODE=4
VERSION_NAME=1.0.3
\ No newline at end of file
game/src/main/assets/bin/Data/boot.config
View file @ 834a3929
gfx-disable-mt-rendering=
gfx-enable-native-gfx-jobs=
wait-for-native-debugger=0
scripting-runtime-version=latest
......
library/src/main/java/com/ym/library/Constant.java
View file @ 834a3929
......@@ -455,8 +455,8 @@ public class Constant {
public static String WelfareCenter = "https://h5v3.zhangxinzhixun.com/huayuan/Welfare";//福利中心
public static String PunchRecord = "https://h5v3.zhangxinzhixun.com/huayuan/ClockIn";//打卡记录
public static String RankList = "https://h5v3.zhangxinzhixun.com/huayuan/Ranking";//排行榜
public static String WithDraw = "http://h5v2test.zhangxinzhixun.com/farm/Withdraw";//提现页
public static String WithDraw = "http://h5v2.zhangxinzhixun.com/farm/Withdraw";//提现页
public static String WithDraw2 = "http://h5v2.zhangxinzhixun.com/farm/Withdraw?novice=1";//提现页
}
public static class SdkKey {
......
library/src/main/java/com/ym/library/activity/CustomWebView.java 0 → 100644
View file @ 834a3929
package com.ym.library.activity;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Build;
import android.util.AttributeSet;
import android.webkit.WebView;
/**
* Craeted by ${junqi.li}
* Craeted by 2020/10/26
*/
public class CustomWebView extends WebView {
public CustomWebView(Context context) {
super(getFixedContext(context));
}
public CustomWebView(Context context, AttributeSet attrs) {
super(getFixedContext(context), attrs);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public CustomWebView(Context context, AttributeSet attrs, int defStyleAttr) {
super(getFixedContext(context), attrs, defStyleAttr);
}
public CustomWebView(Context context, AttributeSet attrs, int defStyleAttr, boolean privateBrowsing) {
super(getFixedContext(context), attrs, defStyleAttr, privateBrowsing);
}
public static Context getFixedContext(Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
return context.createConfigurationContext(new Configuration());
} else {
return context;
}
}
}
library/src/main/java/com/ym/library/activity/WebViewActivity.java
View file @ 834a3929
......@@ -2,6 +2,8 @@ package com.ym.library.activity;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebSettings;
......@@ -24,7 +26,7 @@ public class WebViewActivity extends BaseActivity {
private String url;
private String title;
private WebView webView;
private CustomWebView webView;
@Override
public void before() {
......@@ -53,26 +55,26 @@ public class WebViewActivity extends BaseActivity {
webView.loadUrl(url);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
// url = intent.getData().getQueryParameter("url");
// title = intent.getData().getQueryParameter("title");
// RelativeLayout rl = findViewById(R.id.id_rl_toolbar);
// if (getIntent().getData().getBooleanQueryParameter("showToolbar", true)) {
// rl.setVisibility(View.VISIBLE);
// } else {
// rl.setVisibility(View.GONE);
// }
// webView = findViewById(R.id.activity_webview2);
// initTitle();
//// initWebView();
// webView.loadUrl(url);
}
private void initWebView() {
// webView.setBackgroundColor(getResources().getColor(R.color.color_FEDA83));
//设置WebView的宽高
//==================================引起的白屏========================================
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
// webView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
// }
// // 清缓存和记录，缓存引起的白屏
// webView.clearCache(true);
// webView.clearHistory();
//
// webView.requestFocus();
// webView.getSettings().setDatabaseEnabled(true);
//// 缓存白屏
// String appCachePath = getApplicationContext().getCacheDir()
// .getAbsolutePath() + "/webcache";
//// 设置 Application Caches 缓存目录
// webView.getSettings().setAppCachePath(appCachePath);
// webView.getSettings().setDatabasePath(appCachePath);
//==========================================================================
webView.getSettings().setUseWideViewPort(true);
webView.getSettings().setLoadWithOverviewMode(true);
// webView.getSettings().setDefaultFontSize(56);
......@@ -80,7 +82,6 @@ public class WebViewActivity extends BaseActivity {
// 建议禁止缓存加载，以确保在攻击发生时可快速获取最新的滑动验证组件进行对抗。
webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
// 设置不使用默认浏览器，而直接使用WebView组件加载页面。
// 设置WebView组件支持加载JavaScript。
webView.getSettings().setJavaScriptEnabled(true);
// 建立JavaScript调用Java接口的桥梁。
......@@ -127,7 +128,7 @@ public class WebViewActivity extends BaseActivity {
}
});
TextView tv_title = findViewById(R.id.tv_user_toolbar_title);
tv_title.setText(title+"");
tv_title.setText(title + "");
}
@Override
......@@ -154,9 +155,9 @@ public class WebViewActivity extends BaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
// if (webView != null) {
// webView.destroy();
// }
if (webView != null) {
webView.destroy();
}
}
class WebJavaInterface extends JavaInterface {
......
library/src/main/java/com/ym/library/csj/TTADUtils.kt
View file @ 834a3929
......@@ -82,7 +82,6 @@ object TTADUtils {
ttNativeExpressAd.setExpressInteractionListener(object :ExpressAdInteractionListener{
override fun onAdClicked(p0: View?, p1: Int) {
// AdUpload.onAdClick(newsEntity)
}
override fun onAdShow(p0: View?, p1: Int) {
......@@ -147,12 +146,14 @@ object TTADUtils {
// AdUpload.onAdClick(data)
zxadListener.onAdClicked(data)
EventUtils.apiClient(data?.clk_tracking[0])
EventUtils.onEventUM("ad_splash_click","穿山甲开屏")
}
override fun onAdShow(view: View, i: Int) {
zxadListener.onAdShow(data)
// AdUpload.onAdImpression(data)
EventUtils.apiClient(data?.imp_tracking[0])
EventUtils.onEventUM("ad_splash_show","穿山甲开屏")
}
override fun onAdSkip() {
......@@ -267,12 +268,14 @@ object TTADUtils {
zxadExpressListener.onAdClicked(entity)
// AdUpload.onAdClick(entity)
EventUtils.apiClient(entity?.clk_tracking[0])
EventUtils.onEventUM("ad_feed_click","穿山甲大图")
}
override fun onAdShow(view: View, type: Int) {
zxadExpressListener.onAdShow(entity)
callback.onAdSuccess()
EventUtils.apiClient(entity?.imp_tracking[0])
EventUtils.onEventUM("ad_feed_show","穿山甲大图")
}
override fun onRenderFail(
......@@ -469,13 +472,14 @@ object TTADUtils {
override fun onAdShow() {
EventUtils.apiClient(entity?.imp_tracking[0])
listener.setRewardAdInteractionListener()
EventUtils.onEventUM("ad_reward_video_show","穿山甲激励视频")
// AdUpload.onAdImpression(entity)
}
override fun onAdVideoBarClick() {
EventUtils.apiClient(entity?.clk_tracking[0])
listener.onAdVideoBarClick(entity)
EventUtils.onEventUM("ad_reward_video_click","穿山甲激励视频")
}
override fun onAdClose() {
......
library/src/main/java/com/ym/library/gdt/GDTAdUtils.kt
View file @ 834a3929
......@@ -29,6 +29,7 @@ import com.ym.library.module.NewsEntity
import com.ym.library.net.AdUpload
import com.ym.library.utils.EventUtils
import com.ym.library.utils.EventUtils.apiClient
import com.ym.library.utils.EventUtils.onEventUM
object GDTAdUtils {
......@@ -52,6 +53,7 @@ object GDTAdUtils {
// AdUpload.onAdImpression(newsEntity)
zxadCallback.onAdSuccess()
apiClient(newsEntity?.imp_tracking[0])
onEventUM("ad_splash_show","广点通开屏")
}
override fun onNoAD(p0: AdError?) {
......@@ -64,6 +66,7 @@ object GDTAdUtils {
override fun onADClicked() {
// AdUpload.onAdClick(newsEntity)
apiClient(newsEntity?.clk_tracking[0])
onEventUM("ad_splash_click","广点通开屏")
}
override fun onADTick(p0: Long) {
......@@ -199,12 +202,13 @@ object GDTAdUtils {
override fun onADClicked(p0: NativeExpressADView?) {
// AdUpload.onAdClick(newsEntity)
EventUtils.apiClient(newsEntity?.clk_tracking[0])
onEventUM("ad_feed_click","广点通大图");
}
override fun onRenderSuccess(p0: NativeExpressADView?) {
// AdUpload.onAdImpression(newsEntity)
EventUtils.apiClient(newsEntity?.imp_tracking[0])
onEventUM("ad_feed_show","广点通大图");
}
})
......@@ -262,6 +266,7 @@ object GDTAdUtils {
override fun onADClick() {
apiClient(entity?.clk_tracking[0])
listener.onAdVideoBarClick(entity)
onEventUM("ad_reward_video_click","广点通激励视频")
}
override fun onVideoCached() {
......@@ -302,7 +307,7 @@ object GDTAdUtils {
// AdUpload.onAdImpression(entity)
apiClient(entity.imp_tracking[0])
onEventUM("ad_reward_video_show","广点通激励视频")
}
}) // 有声播放
......
library/src/main/java/com/ym/library/ks/KSADUtils.java
View file @ 834a3929
......@@ -115,6 +115,7 @@ public class KSADUtils {
// mGotoMainActivity = true;
if (newsEntity != null && newsEntity.getClk_tracking().size() > 0) {
EventUtils.INSTANCE.apiClient(newsEntity.getClk_tracking().get(0));
EventUtils.INSTANCE.onEventUM("ad_splash_click","快手开屏");
}
zxadListener.onAdClicked(newsEntity);
}
......@@ -141,6 +142,7 @@ public class KSADUtils {
zxadListener.onAdShow(newsEntity);
if (newsEntity != null && newsEntity.getImp_tracking().size() > 0) {
EventUtils.INSTANCE.apiClient(newsEntity.getImp_tracking().get(0));
EventUtils.INSTANCE.onEventUM("ad_splash_show","快手开屏");
}
LogUtils.e("huang: onAdShowStart");
......@@ -227,6 +229,7 @@ public class KSADUtils {
listener.onAdVideoBarClick(entity);
if (entity.getClk_tracking() != null && entity.getClk_tracking().size() > 0) {
EventUtils.INSTANCE.apiClient(entity.getClk_tracking().get(0));
EventUtils.INSTANCE.onEventUM("ad_reward_video_click","快手激励视频");
}
}
......@@ -258,6 +261,7 @@ public class KSADUtils {
Log.e("huang", "快手 onVideoPlayStart");
if (entity.getImp_tracking() != null && entity.getImp_tracking().size() > 0) {
EventUtils.INSTANCE.apiClient(entity.getImp_tracking().get(0));
EventUtils.INSTANCE.onEventUM("ad_reward_video_show","快手激励视频");
}
// ToastUtil.showToast(mContext, "激励视频广告播放开始");
}
......@@ -354,6 +358,7 @@ public class KSADUtils {
if (ad != null) {
EventUtils.INSTANCE.apiClient(entity.getClk_tracking().get(0));
// Toast.makeText(mContext, "广告" + ad.getAppName() + "被点击", Toast.LENGTH_SHORT).show();
EventUtils.INSTANCE.onEventUM("ad_feed_click","快手大图");
}
}
......@@ -362,6 +367,7 @@ public class KSADUtils {
if (ad != null) {
// Toast.makeText(mContext, "广告" + ad.getAppName() + "展示", Toast.LENGTH_SHORT).show();
EventUtils.INSTANCE.apiClient(entity.getImp_tracking().get(0));
EventUtils.INSTANCE.onEventUM("ad_feed_show","快手大图");
}
}
});
......
library/src/main/java/com/ym/library/utils/EventUtils.kt
View file @ 834a3929
......@@ -73,7 +73,9 @@ object EventUtils {
apiClient(jsonObj)
MobclickAgent.onEvent(AppliContext.get(), action, value)
}
fun onEventUM(action: String, value: String) {
MobclickAgent.onEvent(AppliContext.get(), action, value)
}
fun onVideoEvent(action: String, id: String?, viewTime: Int, value: String) {
val jsonObj = getJSON(action)
jsonObj.put("viewTime", viewTime)
......
library/src/main/java/com/ym/library/ylb/WNManager.kt
View file @ 834a3929
......@@ -43,12 +43,14 @@ object WNManager {
listener.onAdShow()
callback.onAdSuccess()
EventUtils.apiClient(entity?.imp_tracking[0])
EventUtils.onEventUM("ad_reward_video_show","优量宝激励视频")
}
override fun onAdClick() {
Log.d("WNManager", "激励视频点击")
listener.onAdVideoBarClick(entity)
EventUtils.apiClient(entity?.clk_tracking[0])
EventUtils.onEventUM("ad_reward_video_click","优量宝激励视频")
}
override fun onAdClose() {
......
library/src/main/res/layout/activity_webview.xml
View file @ 834a3929
......@@ -33,7 +33,7 @@
android:textStyle="bold" />
</RelativeLayout>
<WebView
<com.ym.library.activity.CustomWebView
android:id="@+id/activity_webview2"
android:layout_width="match_parent"
android:layout_height="match_parent" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment