添加微信分享，接口调试

GoodMoney/app/src/main/AndroidManifest.xml

@@ -164,7 +164,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="tencent1109991028" />
+                <data android:scheme="tencent1111016251" />
             </intent-filter>
         </activity>
         <activity

GoodMoney/app/src/main/assets/supplierconfig.json

@@ -10,7 +10,7 @@
       "appid":"101365295"
     },
     "yingyongbao":{
-      "appid":"1109991028"
+      "appid":"1111016251"
     },
     "baidu":{
       "appid":"17859897"

GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java

@@ -56,7 +56,7 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/consumer/visitorlogin")
+    @POST("api/visitorlogin")
     Observable<BaseResponse<UserBean>> visitorlogin(@Body Map<String, Object> vo);
 
     /**
@@ -104,7 +104,7 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/consumer/sendMobileCode")
+    @POST("api/sendMobileCode")
     Observable<BaseResponse<Object>> sendMobileCode(@Body Map<String, Object> vo);
 
     /**
@@ -112,7 +112,7 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/consumer/mobilelogin")
+    @POST("api/mobilelogin")
     Observable<BaseResponse<UserBean>> login(@Body Map<String, Object> vo);
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt

@@ -293,18 +293,14 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
         mTimer?.setOnCountDownTimerListener(object : OnCountDownTimerListener {
             override fun onTick(millisUntilFinished: Long) {
                 if (!this@AwardActivity.isFinishing) {
-                    if (tvAwardBack != null) {
-                        tvAwardBack.setText("${millisUntilFinished / 1000}")
-                    }
+                    tvAwardBack?.setText("${millisUntilFinished / 1000}")
                 }
             }
 
             override fun onFinish() {
                 if (!this@AwardActivity.isFinishing) {
-                    if (ivAwardBack != null && tvAwardBack != null) {
-                        ivAwardBack.setVisibility(View.VISIBLE)
-                        tvAwardBack.setVisibility(View.GONE)
-                    }
+                    ivAwardBack?.setVisibility(View.VISIBLE)
+                    tvAwardBack?.setVisibility(View.GONE)
                 }
             }
         })

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/AESUtils.java

@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
 
 public class AESUtils {
 
-    private static final String vis = MD5.GetMD5Code("mints_2019").substring(8, 24);
+    private static final String vis = MD5.GetMD5Code("goodmoney_2020").substring(8, 24);
     //    public static final String key = "123456";
     public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
 

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ForegroundOrBackground.java

@@ -2,10 +2,10 @@ package com.mints.goodmoney.utils;
 
 import android.app.Activity;
 import android.app.Application;
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.mints.goodmoney.manager.TrackManager;
 import com.mints.goodmoney.mvp.presenters.VersionUpdatePresenter;
 
 import java.lang.ref.WeakReference;
@@ -20,11 +20,11 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
 
     //获取当前最上层的activity
     private static WeakReference<Activity> app_activity;
-    private static Application foreApplication;
     private VersionUpdatePresenter vup;
+    private WeakReference<Activity> reference;
+    private Intent intent;
 
     public static ForegroundOrBackground init(Application application) {
-        foreApplication = application;
         if (instance == null) {
             instance = new ForegroundOrBackground();
             application.registerActivityLifecycleCallbacks(instance);
@@ -38,20 +38,6 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
 
     @Override
     public void onActivityResumed(Activity activity) {
-        if (activity == null)
-            return;
-        app_activity = new WeakReference<>(activity);
-
-//        String simpleName = activity.getClass().getSimpleName();
-//        if (TextUtils.equals(simpleName, "MainActivity")) {
-//            // 版本更新
-//            if (vup == null) {
-//                vup = new VersionUpdatePresenter();
-//            }
-//            if (app_activity != null) {
-//                vup.updateVersion(app_activity.get());
-//            }
-//        }
     }
 
     @Override
@@ -68,26 +54,33 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
             if (vup == null) {
                 vup = new VersionUpdatePresenter();
             }
-            WeakReference<Activity> reference = new WeakReference<>(activity);
-//            vup.updateVersion(reference.get());
+            if(reference==null){
+                reference = new WeakReference<>(activity);
+            }
+            vup.updateVersion(reference.get());
         }
     }
 
     @Override
     public void onActivityStarted(Activity activity) {
-
         if (activity == null)
             return;
 
-        String simpleName = activity.getClass().getSimpleName();
-        if (
-                TextUtils.equals(simpleName, "MainActivity") ) {
-            count++;
-            return;
-        }
-
+        // 每次返回应用时 都展示开屏广告
+//        String simpleName = activity.getClass().getSimpleName();
+//        if (TextUtils.equals(simpleName, "SplashYlhActivity") ||
+//                TextUtils.equals(simpleName, "GuideActivity") ||
+//                TextUtils.equals(simpleName, "BuyVipActivity") ||
+//                TextUtils.equals(simpleName, "VipActivity") ) {
+//            count++;
+//            return;
+//        }
+//
 //        if (count == 0) {
-//            activity.startActivity(new Intent(activity, TTSplashActivity.class));
+//            if(intent==null){
+//                intent = new Intent(activity, SplashADActivity.class);
+//            }
+//            activity.startActivity(intent);
 //        }
         count++;
     }
@@ -95,11 +88,6 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
     @Override
     public void onActivityStopped(Activity activity) {
         count--;
-
-        if (count == 0) {
-//            System.out.println("mcg __  onActivityStopped");
-            TrackManager.getInstance().offline();
-        }
     }
 
     @Override
@@ -109,6 +97,9 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
 
     @Override
     public void onActivityDestroyed(Activity activity) {
+        if (activity == null)
+            return;
+
         try {
             String simpleName = activity.getClass().getSimpleName();
             if (TextUtils.equals(simpleName, "MainActivity")) {
@@ -119,6 +110,5 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 }
\ No newline at end of file

GoodMoney/shareSdkLib/src/main/assets/ShareSDK.xml

@@ -77,12 +77,12 @@
         但是只能分享图片和文字，username和path是分享小程序用的的，userName是小程序的原始ID，path是小程序内的页面路径；
         而且必须保证微信开放平台与微信公众/小程序绑定才可以分享；不需要的不用管
     -->
-    <Wechat AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" BypassApproval="false"
+    <Wechat AppId="wxc8ac2985f6a805e2" AppSecret="05ec1f88c19ef905325ad4a316f62e9d" BypassApproval="false"
         Enable="true" Id="4"
         MiniprogramType="0" Path="pages/index/index.html?id=1" SortId="4"
         UserName="gh_afb25ac019c9" WithShareTicket="true" />
 
-    <WechatMoments AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" BypassApproval="false"
+    <WechatMoments AppId="wxc8ac2985f6a805e2" AppSecret="05ec1f88c19ef905325ad4a316f62e9d" BypassApproval="false"
         Enable="true" Id="5" SortId="5" />
 
     <WechatFavorite AppId="wx4868b35061f87885" AppSecret="64020361b8ec4c99936c0e3999a9f249" Enable="true"
@@ -90,7 +90,7 @@
 
     <!-- ShareByAppClient标识是否使用微博客户端分享，默认是false -->
 
-    <QQ AppId="1109991028" AppKey="RQD3TKgd1FpMTMYY" BypassApproval="false" Enable="true" Id="7"
+    <QQ AppId="1111016251" AppKey="MsZdB6wyczXaysft" BypassApproval="false" Enable="true" Id="7"
         ShareByAppClient="true" SortId="7" />