1、新增切换账号接口

2、代码优化

app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.tencent.tmgp.xzsjjby"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/funcheer/channel/sdk/MainActivity.java

@@ -104,6 +104,7 @@ public class MainActivity extends Activity implements View.OnClickListener {
     private void initUI() {
         findViewById(getResourceId("fq_login", "id")).setOnClickListener(this);
         findViewById(getResourceId("fq_logout", "id")).setOnClickListener(this);
+        findViewById(getResourceId("fq_change_account", "id")).setOnClickListener(this);
         findViewById(getResourceId("fq_charge", "id")).setOnClickListener(this);
         findViewById(getResourceId("fq_report_data", "id")).setOnClickListener(this);
         findViewById(getResourceId("fq_exit", "id")).setOnClickListener(this);
@@ -122,6 +123,10 @@ public class MainActivity extends Activity implements View.OnClickListener {
                 logout();
                 break;
 
+            case R.id.fq_change_account:
+                changeAccount();
+                break;
+
             case R.id.fq_report_data:
                 dataReport();
                 break;
@@ -304,6 +309,11 @@ public class MainActivity extends Activity implements View.OnClickListener {
         });
     }
 
+    private void changeAccount() {
+        FqLog.i(TAG,"changeAccount");
+        FqGame.changeAccount(this);
+    }
+
     private void showResult(String message) {
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }

app/src/main/res/layout/fq_activity_main.xml

@@ -46,6 +46,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/fq_logout" />
+                <Button
+                    android:id="@+id/fq_change_account"
+                    android:layout_marginTop="5dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fq_change_account" />
 
             </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -5,7 +5,7 @@
     <string name="fq_user">用户</string>
     <string name="fq_login">登录</string>
     <string name="fq_logout">注销</string>
-    <string name="fq_switch_account">切换账号</string>
+    <string name="fq_change_account">切换账号</string>
 
     <string name="fq_charge_module">支付</string>
     <string name="fq_input_price">输入价格：</string>

fq_channel_ysdk/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

fq_channel_ysdk/src/main/java/com/fq/channel/sdk/SdkPluginYsdk.java

@@ -556,7 +556,8 @@ public class SdkPluginYsdk extends FQPluginApi implements UserListener, BuglyLis
     private void ysdkPayNotify(ReqYsdkPayBody payBody){
         String request = ParamsUtils.getInstance().generateParams(payBody);
         FqLog.i(TAG, "ysdkPayNotify:" + request);
-        HttpManager.getInstance().post(FqConfig.get().getBaseUrl()+"/api/sdk/ysdk/v1/notify ", Utils.decodeText(request), new BaseCallback() {
+//        FqConfig.get().getBaseUrl()+
+        HttpManager.getInstance().post("https://app.funcheergame.com/api/sdk/ysdk/v1/notify ", Utils.decodeText(request), new BaseCallback() {
             @Override
             public void onFailure(BaseException msg) {
                 FqLog.e(TAG, "ysdkPayNotify: onFailure" + msg.getMsg());

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGame.java

@@ -1,9 +1,11 @@
 package com.fq.channel.sdk.api;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import com.fq.channel.sdk.base.bean.LoginInfo;
 import com.fq.channel.sdk.base.bean.PaymentInfo;
@@ -68,8 +70,8 @@ public class FqGame {
      *
      * @param activity
      */
-    public static void changeAccount(@NonNull Activity activity){
-        ApiPlugin.getInstace().changeAccount(activity);
+    public static void changeAccount(@NonNull Context activity){
+        FqGameHander.changeAccount((Activity) activity);
     }
     /**
      * 提供给CP调用的登出接口

fq_plugin_api/src/main/java/com/fq/channel/sdk/api/FqGameHander.java

@@ -1,7 +1,9 @@
 package com.fq.channel.sdk.api;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
 
 import com.fq.channel.sdk.base.bean.LoginInfo;
 import com.fq.channel.sdk.base.bean.PaymentInfo;
@@ -96,7 +98,7 @@ public class FqGameHander {
         });
     }
 
-    public static void login(@NonNull Activity activity, final IResult<LoginInfo> resultLoginInfo) {
+    public static void login(@NonNull Activity activity, final IResult<LoginInfo> iResult) {
         JointManager.getInstance().login(activity, new PluginResultHandler() {
             @Override
             public void onHandlePluginResult(PluginResult result) {
@@ -107,15 +109,15 @@ public class FqGameHander {
                     Object res_msg = result.getRawMessage();
                     JSONObject jo = (JSONObject) res_msg;
                     try {
-                        resultLoginInfo.onSuccess(new LoginInfo(jo.get("uid").toString(), jo.get("token").toString()));
+                        iResult.onSuccess(new LoginInfo(jo.get("uid").toString(), jo.get("token").toString()));
                     } catch (JSONException e) {
-                        resultLoginInfo.onFail("JSONException");
+                        iResult.onFail("JSONException");
                         e.printStackTrace();
                     }
                 } else if (PluginResult.Status.CANCEL == mStatus) {
-                    resultLoginInfo.onFail(result.getMessage());
+                    iResult.onFail(result.getMessage());
                 } else if (PluginResult.Status.ERROR == mStatus) {
-                    resultLoginInfo.onFail(result.getMessage());
+                    iResult.onFail(result.getMessage());
                 }
             }
         });
@@ -163,19 +165,23 @@ public class FqGameHander {
         });
     }
 
-    public static void logout(Activity activity, final ILogout exit) {
+    public static void logout(Activity activity, final ILogout logout) {
         JointManager.getInstance().logout(activity, new PluginResultHandler() {
             @Override
             public void onHandlePluginResult(PluginResult result) {
                 PluginResult.Status mStatus = result.getStatus();
                 FqLog.i(TAG, "logout mStatus :" + mStatus);
                 if (PluginResult.Status.OK == mStatus) {
-                    exit.onLogout();
+                    logout.onLogout();
                 }
             }
         });
     }
 
+    public static void changeAccount(Activity activity) {
+        JointManager.getInstance().changeAccount(activity);
+    }
+
     protected static void onRequestPermissionsResult(int requestCode,
                                                      String[] permissions, int[] grantResults) {
         PermissionManager.getInstance().onRequestPermissionsResult(requestCode, permissions, grantResults);

fq_plugin_base/build.gradle

@@ -25,4 +25,6 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
+    api 'androidx.appcompat:appcompat:1.0.2'
 }

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/permission/PermissionManager.java

@@ -5,8 +5,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.fq.channel.sdk.base.interfaces.IPermissionRequestCallback;
 

fq_plugin_base/src/main/java/com/fq/channel/sdk/base/utils/Utils.java

@@ -10,14 +10,15 @@ import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.IntegerRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.IntegerRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;

fq_plugin_core/src/main/java/com/fq/channel/sdk/core/JointManager.java

@@ -73,6 +73,10 @@ public class JointManager {
         ApiPlugin.getInstace().login(context, onLoginCallBack);
     }
 
+    public void changeAccount(Context context) {
+        ApiPlugin.getInstace().changeAccount(context);
+    }
+
     /**
      * 登录回调处理
      */