Skip to content

A
android_highgold_pro
Commit fcbf9f31 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码账号切换分享连接id不变问题，去除代码位提示，新闻修改

parent 78eba13f
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 37 deletions
app/build.gradle
View file @ fcbf9f31
......@@ -62,11 +62,17 @@ android {
debug {
// 不显示Log
// buildConfigField "boolean", "LOG_DEBUG", "true"
// buildConfigField "String", "AppKeyPre", "\"abcd\""
// buildConfigField "String", "MainIp", DEBUG_URL
// manifestPlaceholders = [TD_SCHEMA_KEY: DEBUG_TD_SCHEMA_KEY,
// TD_KEY : DEBUG_TD_KEY]
buildConfigField "boolean", "LOG_DEBUG", "true"
buildConfigField "String", "AppKeyPre", "\"abcd\""
buildConfigField "String", "MainIp", DEBUG_URL
manifestPlaceholders = [TD_SCHEMA_KEY: DEBUG_TD_SCHEMA_KEY,
TD_KEY : DEBUG_TD_KEY]
buildConfigField "String", "MainIp", RELEASE_URL
manifestPlaceholders = [TD_SCHEMA_KEY: RELEASE_TD_SCHEMA_KEY,
TD_KEY : RELEASE_TD_KEY]
//混淆
minifyEnabled false
......@@ -79,17 +85,6 @@ android {
release {
// 不显示Log
buildConfigField "boolean", "LOG_DEBUG", "false"
buildConfigField "String", "AppKeyPre", "\"abcd\""
buildConfigField "String", "MainIp", RELEASE_URL
manifestPlaceholders = [TD_SCHEMA_KEY: RELEASE_TD_SCHEMA_KEY,
TD_KEY : RELEASE_TD_KEY]
//混淆
minifyEnabled true
zipAlignEnabled true
shrinkResources true//打开
// buildConfigField "boolean", "LOG_DEBUG", "false"
// buildConfigField "String", "AppKeyPre", "\"abcd\""
// buildConfigField "String", "MainIp", RELEASE_URL
......@@ -97,9 +92,20 @@ android {
// TD_KEY : RELEASE_TD_KEY]
//
// //混淆
// minifyEnabled false
// zipAlignEnabled false
// shrinkResources false//打开
// minifyEnabled true
// zipAlignEnabled true
// shrinkResources true//打开
buildConfigField "boolean", "LOG_DEBUG", "true"
buildConfigField "String", "AppKeyPre", "\"abcd\""
buildConfigField "String", "MainIp", RELEASE_URL
manifestPlaceholders = [TD_SCHEMA_KEY: RELEASE_TD_SCHEMA_KEY,
TD_KEY : RELEASE_TD_KEY]
//混淆
minifyEnabled false
zipAlignEnabled false
shrinkResources false//打开
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
......
app/src/main/java/com/mints/goldspace/ad/banner/BannerManager.kt
View file @ fcbf9f31
......@@ -8,6 +8,7 @@ import com.bytedance.sdk.openadsdk.TTNativeExpressAd
import com.mints.goldspace.MintsApplication
import com.mints.goldspace.manager.TtCsjAdManager
import com.mints.goldspace.utils.LogUtil
import com.mints.goldspace.utils.ToastUtil
/**
* banner管理
......
app/src/main/java/com/mints/goldspace/ad/video/CsjVideoAdManager.java
View file @ fcbf9f31
package com.mints.goldspace.ad.video;
import android.app.Activity;
import android.widget.Toast;
import com.bytedance.sdk.openadsdk.AdSlot;
import com.bytedance.sdk.openadsdk.TTAdConstant;
......@@ -137,6 +138,9 @@ public class CsjVideoAdManager extends BaseVideoAd {
break;
}
}
// showToast("穿山甲激励视频代码位:" + codeId);
String userID = userManager.getUserID();
String tid = MD5.GetMD5Code(System.currentTimeMillis() + userID);
......
app/src/main/java/com/mints/goldspace/ad/video/YlhVideoAdManager.java
View file @ fcbf9f31
......@@ -3,6 +3,7 @@ package com.mints.goldspace.ad.video;
import android.app.Activity;
import android.os.SystemClock;
import com.mints.goldspace.MintsApplication;
import com.mints.goldspace.common.AppConfig;
import com.mints.goldspace.common.Constant;
import com.mints.goldspace.manager.TrackManager;
......@@ -10,6 +11,7 @@ import com.mints.goldspace.manager.YlhAdManager;
import com.mints.goldspace.mvp.presenters.YlhVideoAdPresenter;
import com.mints.goldspace.mvp.views.VideoAdManagerView;
import com.mints.goldspace.utils.LogUtil;
import com.mints.goldspace.utils.ToastUtil;
import com.qq.e.ads.rewardvideo.RewardVideoAD;
import com.qq.e.ads.rewardvideo.RewardVideoADListener;
import com.qq.e.comm.util.AdError;
......
app/src/main/java/com/mints/goldspace/common/Constant.kt
View file @ fcbf9f31
......@@ -196,8 +196,6 @@ object Constant {
// 打开激活
const val FIRST_DEVICE_FLAG = "first_device_flag"
var SHARE_URL: String = BuildConfig.MainIp + "wxShare/toShare?shareId=" + UserManager.getInstance().userID
// 首页视频时长 单位-秒
const val MAIN_VEDIO_TIME = "main_vedio_time"
......
app/src/main/java/com/mints/goldspace/manager/RsNewsManager.kt
View file @ fcbf9f31
......@@ -10,7 +10,7 @@ import com.xr.xrsdk.XRNewsManager
*/
object RsNewsManager {
private const val APP_ID = "7ef25833adcd4c08ac5d91e9d5543871 "
private const val APP_ID = "7ef25833adcd4c08ac5d91e9d5543871"
private const val WX_APP_ID = "85b57367477947e5b33ca10f785d752d"
/**
......
app/src/main/java/com/mints/goldspace/mvp/presenters/TaskPresenter.kt
View file @ fcbf9f31
......@@ -29,7 +29,11 @@ class TaskPresenter : BasePresenter<TaskView>() {
override fun onCompleted() {
}
override fun onError(e: Throwable) {}
override fun onError(e: Throwable) {
if (isLinkView) return
view.hideLoading()
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
if (isLinkView) return
......
app/src/main/java/com/mints/goldspace/ui/fragment/MoneyFragment.kt
View file @ fcbf9f31
......@@ -164,7 +164,8 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
}
fun selectXmly() {
xtFragmentMoney.getTabAt(2)?.select()
xtFragmentMoney.getTabAt(1)?.select()
// xtFragmentMoney.getTabAt(2)?.select()
if (xmlyGameFragment == null) {
xmlyGameFragment = XmlyFragment()
}
......
app/src/main/java/com/mints/goldspace/ui/widgets/ShareDialog.kt
View file @ fcbf9f31
......@@ -17,11 +17,14 @@ import cn.sharesdk.framework.PlatformActionListener
import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
import cn.sharesdk.wechat.moments.WechatMoments
import com.mints.goldspace.BuildConfig
import com.mints.goldspace.MintsApplication
import com.mints.goldspace.R
import com.mints.goldspace.common.Constant
import com.mints.goldspace.manager.UserManager
import com.mints.goldspace.ui.adapter.SharePagerAdapter
import com.mints.goldspace.ui.widgets.seekbar.BubbleUtils
import com.mints.goldspace.utils.LogUtil
import com.mints.goldspace.utils.QRCodeUtil
import com.mints.goldspace.utils.ToastUtil
import com.mints.library.utils.GlideUtils
......@@ -72,8 +75,10 @@ class ShareDialog(context: Context) : Dialog(context, R.style.dialog) {
viewPager = findViewById(R.id.view_pager)
viewPager.pageMargin = BubbleUtils.dp2px(30)
val QRCode = QRCodeUtil.createQRCode(Constant.SHARE_URL, 50)
val SHARE_URL: String = BuildConfig.MainIp + "wxShare/toShare?shareId=" + UserManager.getInstance().userID
// LogUtil.d("ShareDialog", "cons:" + Constant.SHARE_URL)
// LogUtil.d("ShareDialog", "method:" + SHARE_URL)
val QRCode = QRCodeUtil.createQRCode(SHARE_URL, 50)
val inflater = LayoutInflater.from(context)
val view1 = inflater.inflate(R.layout.item_share_view, null)
val view2 = inflater.inflate(R.layout.item_share_view, null)
......
app/src/main/java/com/mints/goldspace/utils/ToastUtil.java
View file @ fcbf9f31
......@@ -36,14 +36,14 @@ public class ToastUtil {
}
public static void showLong(Context context, String msg) {
showToast(context, msg, Toast.LENGTH_LONG, Gravity.CENTER);
// try {
// ToastUtils.show(msg);
// } catch (Exception e) {
// e.printStackTrace();
// showToast(context, msg, Toast.LENGTH_LONG, Gravity.CENTER);
// }
// showToast(context, msg, Toast.LENGTH_LONG, Gravity.CENTER);
try {
ToastUtils.show(msg);
} catch (Exception e) {
e.printStackTrace();
showToast(context, msg, Toast.LENGTH_LONG, Gravity.CENTER);
}
}
public static void show(Context context, String msg, boolean isShowToast) {
......
app/src/main/res/layout/item_fragment_main_my_customer_service.xml
View file @ fcbf9f31
......@@ -23,6 +23,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp"
android:text="请关注公众号：淘金空间，获取更多赚钱资讯" />
android:text="请关注公众号：淘金微管家，获取更多赚钱资讯" />
</merge>
\ No newline at end of file
gradle.properties
View file @ fcbf9f31
......@@ -16,8 +16,8 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#DEBUG_URL="http://39.97.65.143:9082/api/"
DEBUG_URL="http://192.168.31.193:8101/"
DEBUG_URL="http://39.97.65.143:9082/api/"
#DEBUG_URL="http://192.168.31.193:8101/"
RELEASE_URL="https://api.mints-id.com/gsnew-api/"
RELEASE_KEY_PASSWORD=gold.space
......@@ -36,7 +36,7 @@ DEBUG_TD_SCHEMA_KEY=talkingdata.ae31f29bc828482990eddd1bb799c7b3
RELEASE_TD_SCHEMA_KEY=talkingdata.b2d6d7525094470ea990c3f94278b404
#友盟
RELEASE_UMENG_KEY=5db5876b570df381430007da
RELEASE_UMENG_KEY=601f8398425ec25f10efbe06
#JPush
RELEASE_JPUSH_KEY=d1fc227e2d3ec3c7a8cafa69
......
shareSdkLib/src/main/assets/ShareSDK.xml
View file @ fcbf9f31
......@@ -85,7 +85,7 @@
<WechatMoments AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" BypassApproval="false"
Enable="true" Id="5" SortId="5" />
<WechatFavorite AppId="wx4868b35061f87885" AppSecret="64020361b8ec4c99936c0e3999a9f249" Enable="true"
<WechatFavorite AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" Enable="true"
Id="6" SortId="6" />
<!-- ShareByAppClient标识是否使用微博客户端分享，默认是false -->
......
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