Skip to content

A
android_highgold
Commit 480edf39 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

1.1.5发版

parent 6d6902f1
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 72 deletions
highgold/app/build.gradle
View file @ 480edf39
......@@ -122,6 +122,7 @@ android {
yingyongbao {}
oppo {}
highgold {}
highgoldpkg {}
vivo {}
}
......
highgold/app/src/main/java/com/mints/highgold/common/Constant.java
View file @ 480edf39
......@@ -256,11 +256,13 @@ public interface Constant {
String HOT_ACTIVITY_YWHZ = "ywhz";// 鱼丸盒子
String HOT_ACTIVITY_YQHY = "yqhy";// 邀请好友
String HOT_ACTIVITY_CHB = "chb";// 拆红包
String HOT_ACTIVITY_YDZQ = "ydzq";// 阅读赚钱
String HOT_ACTIVITY_SID = "hotNews";// 新闻资讯
// 穿山甲激励视频id
String CSJ_VEDIO_APPIP = "csj_vedio_appip";
String JIPUSH_FLAG = "jipush_flag";
// 调用事件 0 成功 1失败 2点击 3-有效展示 4-去重
String EVENT_TYPE_ZERO = "0";
......
highgold/app/src/main/java/com/mints/highgold/mvp/model/UserTaskMsgBean.java
View file @ 480edf39
......@@ -86,6 +86,8 @@ public class UserTaskMsgBean implements Serializable {
private int vedioplan_chuangshen_vedio_surplus;
private int vedioplan_domob_vedio_surplus;
private int JPushLogin;
public int getVedioplan_hytech_vedio_rate() {
return vedioplan_hytech_vedio_rate;
}
......@@ -446,4 +448,12 @@ public class UserTaskMsgBean implements Serializable {
public void setVedioplan_domob_vedio_surplus(int vedioplan_domob_vedio_surplus) {
this.vedioplan_domob_vedio_surplus = vedioplan_domob_vedio_surplus;
}
public int getJPushLogin() {
return JPushLogin;
}
public void setJPushLogin(int JPushLogin) {
this.JPushLogin = JPushLogin;
}
}
highgold/app/src/main/java/com/mints/highgold/ui/activitys/AdWebActivity.java
View file @ 480edf39
......@@ -51,6 +51,7 @@ import com.mints.highgold.R;
import com.mints.highgold.common.Constant;
import com.mints.highgold.common.DeviceInfo;
import com.mints.highgold.manager.UserManager;
import com.mints.highgold.ui.activitys.base.BaseActivity;
import com.mints.highgold.utils.LogUtil;
import com.mints.highgold.utils.SystemUtils;
import com.tencent.smtt.sdk.WebChromeClient;
......@@ -69,7 +70,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
public class AdWebActivity extends AppCompatActivity {
public class AdWebActivity extends BaseActivity {
private static final String TAG = AdWebActivity.class.getSimpleName();
......@@ -96,9 +97,17 @@ public class AdWebActivity extends AppCompatActivity {
public static final String AUTHORITY = Constant.MINTS_PKG_NAME + ".fileprovider";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_adweb);
protected boolean isApplyKitKatTranslucency() {
return false;
}
@Override
protected int getContentViewLayoutID() {
return R.layout.activity_adweb;
}
@Override
protected void initViewsAndEvents() {
webView = findViewById(R.id.webview);
btn = findViewById(R.id.btn);
swipeLayout = findViewById(R.id.swipe_container);
......@@ -229,15 +238,19 @@ public class AdWebActivity extends AppCompatActivity {
ActivityCompat.requestPermissions(this, permissions, REQUEST_CODE);
} else {
//权限已经都通过了，可以将程序继续打开了
try {
TelephonyManager TelephonyMgr = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
imei = TelephonyMgr.getDeviceId();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
try {
meid = TelephonyMgr.getMeid();
} catch (Exception e) {
}
}
imei = TelephonyMgr.getDeviceId();
}catch (Exception e){
}
openUrl();
}
}
......@@ -383,20 +396,7 @@ public class AdWebActivity extends AppCompatActivity {
String keycode = "10107" + imei + meid +oaid+ androidid+"1" + userid + "P6eYtFaq2go7QUsVthWlh2O7VHpjwyNh";
keycode = string2MD5(keycode).toLowerCase();
webView.loadUrl("https://www.51gzdhh.xyz/pipi/newList?userid=" + userid + "&imei=" + imei + "&gtype=1&pid=10107&sign=" + keycode + "&meid=" + meid + "&oaid=" + oaid + "&androidid=" + androidid);
LogUtil.d(TAG, "https://www.51gzdhh.xyz/pipi/newList?userid=" + userid + "&imei=" + imei + "&gtype=1&pid=10107&sign=" + keycode + "&meid=" + meid + "&oaid=" + oaid + "&androidid=" + androidid);
// String userid = "123456";
// imei= "";
// meid = "";
// oaid = "";
// androidid = "";
// //pid+imei+gtype+userid+key 测试数据
// String keycode = "3" + imei+meid + "1" + userid + "adhefoiqijefijewfowef";
// keycode = string2MD5(keycode).toLowerCase();
// //加载链接 仅仅作为测试，实际对接请加oaid 和 androidid
// webView.loadUrl("https://www.51gzdhh.xyz/pipi/newList?userid=" + userid + "&imei=" + imei + "&gtype=1&pid=3&sign=" + keycode+"&meid="+meid+ "&style=2"+"&oaid="+"&androidid=");
// Log.i("url:", "https://www.51gzdhh.xyz/pipi/newList?userid=" + userid + "&imei=" + imei + "&gtype=1&pid=3&sign=" + keycode+"&meid="+meid+"&oaid="+"&androidid=");
// LogUtil.d(TAG, "https://www.51gzdhh.xyz/pipi/newList?userid=" + userid + "&imei=" + imei + "&gtype=1&pid=10107&sign=" + keycode + "&meid=" + meid + "&oaid=" + oaid + "&androidid=" + androidid);
}
......@@ -660,7 +660,7 @@ public class AdWebActivity extends AppCompatActivity {
this.hadLoade45 = false;
this.hadLoade75 = false;
this.js = js;
LogUtil.d(TAG,"setJs..." + js);
// LogUtil.d(TAG,"setJs..." + js);
}
@JavascriptInterface
......@@ -668,12 +668,12 @@ public class AdWebActivity extends AppCompatActivity {
this.isCanLoadFiJs = false;
this.js = "";
LogUtil.d(TAG, "closeJs ...");
// LogUtil.d(TAG, "closeJs ...");
}
@JavascriptInterface
public void test() {
LogUtil.d(TAG, "CheckInstall ...");
// LogUtil.d(TAG, "CheckInstall ...");
}
/**
......@@ -684,7 +684,7 @@ public class AdWebActivity extends AppCompatActivity {
@JavascriptInterface
public void CheckInstall(final String packageName) {
LogUtil.d(TAG,packageName + "...");
// LogUtil.d(TAG,packageName + "...");
packagenameLocal = packageName;
final boolean isInstalled = SystemUtils.isAppInstalled(AdWebActivity.this, packageName);
......@@ -693,7 +693,7 @@ public class AdWebActivity extends AppCompatActivity {
@Override
public void run() {
webView.loadUrl("javascript:CheckInstall_Return(1)");
LogUtil.d(TAG, packageName + "...1");
// LogUtil.d(TAG, packageName + "...1");
}
});
} else {
......@@ -701,7 +701,7 @@ public class AdWebActivity extends AppCompatActivity {
@Override
public void run() {
webView.loadUrl("javascript:CheckInstall_Return(0)");
LogUtil.d(TAG,packageName + "...2");
// LogUtil.d(TAG,packageName + "...2");
}
});
}
......@@ -718,7 +718,7 @@ public class AdWebActivity extends AppCompatActivity {
@JavascriptInterface
public void initPceggsData(final String showType, final String buttonType, final String buttonName, String downUlr) {
LogUtil.d(TAG,showType + "...." + buttonType + "..." + buttonName + "..." + downUlr);
// LogUtil.d(TAG,showType + "...." + buttonType + "..." + buttonName + "..." + downUlr);
downUrlLocal = downUlr;
......@@ -1005,8 +1005,11 @@ public class AdWebActivity extends AppCompatActivity {
showPermissionDialog();
} else {
//权限已经都通过了，可以将程序继续打开了
try {
TelephonyManager TelephonyMgr = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
imei = TelephonyMgr.getDeviceId();
}catch (Exception e){
}
openUrl();
}
}
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/WxLoginActivity.java
View file @ 480edf39
......@@ -167,6 +167,7 @@ public class WxLoginActivity extends BaseActivity implements WxLoginView, OnLogi
protected void onResume() {
super.onResume();
if (spUtil != null && spUtil.getInt(Constant.JIPUSH_FLAG) == 1) {
try {
if (JVerificationInterface.checkVerifyEnable(this)) {
// 支持
......@@ -178,6 +179,7 @@ public class WxLoginActivity extends BaseActivity implements WxLoginView, OnLogi
} catch (Exception e) {
}
}
if (wxLoginFlag && !isFinishing()) {
wxLoginFlag = false;
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java
View file @ 480edf39
......@@ -358,8 +358,9 @@ public class MainFragment extends BaseFragment
Bundle bundle;
switch (view.getId()) {
case R.id.tv_fragment_main_whatgold:// 如何赚金币
// readyGo(WhatGoldActivity.class);
readyGo(AdWebActivity.class);
readyGo(WhatGoldActivity.class);
break;
case R.id.rl_fragment_main_redbox:// 红包
readyGo(RedboxActivity.class);
......@@ -404,7 +405,8 @@ public class MainFragment extends BaseFragment
}
break;
case R.id.ll_fragment_main_friend:// 邀请好友
readyGo(FriendsNewActivity.class);
// readyGo(FriendsNewActivity.class);
readyGo(AdWebActivity.class);
break;
case R.id.iv_fragment_main_banner:
boolean main = getActivity() instanceof MainActivity;
......@@ -473,6 +475,7 @@ public class MainFragment extends BaseFragment
// 保存穿山甲激励视频ip
spUtil.putString(Constant.CSJ_VEDIO_APPIP, data.getAppIp());
spUtil.putInt(Constant.JIPUSH_FLAG, data.getJPushLogin());
//测试数据
......@@ -499,11 +502,11 @@ public class MainFragment extends BaseFragment
vedioAdingManager.initAdWeight(data.getVedioplan_csj_vedio_rate(), data.getVedioplan_lyh_vedio_rate(),
data.getVedioplan_csj_full_screen_video_rate(), data.getVedioplan_hytech_vedio_rate(),
data.getVedioplan_mintegral_vedio_rate(), data.getVedioplan_coral_vedio_rate(),
data.getVedioplan_chuangshen_vedio_rate(),data.getVedioplan_domob_vedio_rate());
data.getVedioplan_chuangshen_vedio_rate(), data.getVedioplan_domob_vedio_rate());
}
LogUtil.d(TAG, "首页权重值：csjVedioWeight:" + data.getVedioplan_csj_vedio_rate() + " ylhWeight:" + data.getVedioplan_lyh_vedio_rate() + " csjFullWeight:" + data.getVedioplan_csj_full_screen_video_rate() +
" hytechVedioAdWeight:" + data.getVedioplan_hytech_vedio_rate() + " mintegralVedioAdWeight:" + data.getVedioplan_mintegral_vedio_rate() + " shanhuVedioAdWeight:" + data.getVedioplan_coral_vedio_rate()+
" chuangshenVedioAdWeight:" + data.getVedioplan_chuangshen_vedio_rate()+" domobVedioAdWeight:" + data.getVedioplan_domob_vedio_rate());
" hytechVedioAdWeight:" + data.getVedioplan_hytech_vedio_rate() + " mintegralVedioAdWeight:" + data.getVedioplan_mintegral_vedio_rate() + " shanhuVedioAdWeight:" + data.getVedioplan_coral_vedio_rate() +
" chuangshenVedioAdWeight:" + data.getVedioplan_chuangshen_vedio_rate() + " domobVedioAdWeight:" + data.getVedioplan_domob_vedio_rate());
// 广告视频数
AppConfig.csjVedioAdCount = data.getVedioplan_csj_vedio_surplus();
AppConfig.ylhAdCount = data.getVedioplan_lyh_vedio_surplus();
......@@ -514,17 +517,17 @@ public class MainFragment extends BaseFragment
AppConfig.chuangshenVedioAdCount = data.getVedioplan_chuangshen_vedio_surplus();
AppConfig.duomentVedioAdCount = data.getVedioplan_domob_vedio_surplus();
LogUtil.d(TAG, "首页视频数：csjVedioAdCount:" + data.getVedioplan_csj_vedio_surplus() + " ylhAdCount:" + data.getVedioplan_lyh_vedio_surplus() + " csjFullAdCount:" + data.getVedioplan_csj_full_screen_video_surplus() +
" hytechVedioAdCount:" + data.getVedioplan_hytech_vedio_surplus() + " mintegralVedioAdCount:" + data.getVedioplan_mintegral_vedio_surplus() + " shanhuVedioAdCount:" + data.getVedioplan_coral_vedio_surplus()+
" chuangshenVedioAdCount:" + data.getVedioplan_chuangshen_vedio_surplus()+" domobVedioAdCount:" + data.getVedioplan_domob_vedio_surplus());
" hytechVedioAdCount:" + data.getVedioplan_hytech_vedio_surplus() + " mintegralVedioAdCount:" + data.getVedioplan_mintegral_vedio_surplus() + " shanhuVedioAdCount:" + data.getVedioplan_coral_vedio_surplus() +
" chuangshenVedioAdCount:" + data.getVedioplan_chuangshen_vedio_surplus() + " domobVedioAdCount:" + data.getVedioplan_domob_vedio_surplus());
AppConfig.yilanVedioTime = data.getRedPacketSecond();
userManager.setAdShowFlag(data.isAdFlag());
// 显示游戏文字
tvFragmentMainFriendHint.setText(new SpanUtils().append("每邀一位得")
.append(data.getFirstGiveFriendCoin() + "").setForegroundColor(getResources().getColor(R.color.main_mints))
.create());
// tvFragmentMainFriendHint.setText(new SpanUtils().append("每邀一位得")
// .append(data.getFirstGiveFriendCoin() + "").setForegroundColor(getResources().getColor(R.color.main_mints))
// .create());
// 游戏赚按钮
boolean main = getActivity() instanceof MainActivity;
......@@ -1125,9 +1128,9 @@ public class MainFragment extends BaseFragment
// 显示游戏文字
tvFragmentMainFriendHint.setText(new SpanUtils().append("每邀一位得")
.append("1000").setForegroundColor(getResources().getColor(R.color.main_mints))
.create());
// tvFragmentMainFriendHint.setText(new SpanUtils().append("每邀一位得")
// .append("1000").setForegroundColor(getResources().getColor(R.color.main_mints))
// .create());
// 显示红包动画
initGiftAnim(rlFragmentMainRedbox);
......@@ -1446,7 +1449,7 @@ public class MainFragment extends BaseFragment
TextUtils.equals(adType, Constant.CSJ_VEDIO_AD) ||
TextUtils.equals(adType, Constant.CSJ_FULL_AD) ||
TextUtils.equals(adType, Constant.SHANHU_VEDIO_AD) ||
TextUtils.equals(adType, Constant.MINTEGRAL_VEDIO_AD)||
TextUtils.equals(adType, Constant.MINTEGRAL_VEDIO_AD) ||
TextUtils.equals(adType, Constant.DUOMENT_VEDIO_AD)) {
if (TextUtils.equals(adType, Constant.YLH_VEDIO_AD)) {
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/MyFragment.java
View file @ 480edf39
......@@ -28,6 +28,7 @@ import com.mints.highgold.mvp.presenters.MyPresenter;
import com.mints.highgold.mvp.views.MyView;
import com.mints.highgold.ui.activitys.Aboutas2Activity;
import com.mints.highgold.ui.activitys.AboutasActivity;
import com.mints.highgold.ui.activitys.AdWebActivity;
import com.mints.highgold.ui.activitys.DrawcashActivity;
import com.mints.highgold.ui.activitys.FeekbackActivity;
import com.mints.highgold.ui.activitys.FriendsNewActivity;
......@@ -291,21 +292,18 @@ public class MyFragment extends BaseFragment
showMissingPermissionDialog("设备、储存");
}
});
// boolean main = getActivity() instanceof MainActivity;
// if (main) {
// MainActivity activity = (MainActivity) getActivity();
// activity.clickTab2Layout();
// }
break;
case Constant.HOT_ACTIVITY_CHB:
readyGo(RedboxActivity.class);
// readyGo(YilanVedioActivity.class);
break;
case Constant.HOT_ACTIVITY_YQHY:
Bundle bundle = new Bundle();
bundle.putInt(Constant.FRIENDS_SHOWPAGEFLAG, 1);
readyGo(FriendsNewActivity.class, bundle);
break;
case Constant.HOT_ACTIVITY_YDZQ:
readyGo(AdWebActivity.class);
break;
default:
showToast("该热门活动暂未开放");
break;
......
highgold/app/src/main/res/layout/activity_adweb.xml
View file @ 480edf39
......@@ -5,6 +5,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="阅读赚钱"
android:layout_centerHorizontal="true"
android:layout_marginTop="70pt"
android:layout_marginBottom="20pt"
android:textColor="@color/product_net_text"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
highgold/app/src/main/res/layout/fragment_main_first.xml
View file @ 480edf39
......@@ -194,7 +194,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邀请好友"
android:text="阅读赚钱"
android:textColor="@color/black"
android:textSize="18sp" />
......@@ -203,7 +203,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2pt"
android:text="每邀一位得3000"
android:text="阅读文章来赚钱"
android:textColor="@color/graya"
android:textSize="12sp" />
</LinearLayout>
......
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