修复启动隐私协议接口。

demo/build.gradle

@@ -74,5 +74,6 @@ dependencies {
     implementation project(path: ':library_channel')
     implementation project(path: ':library_platform')
     implementation project(path: ':library_platform:platform_hnyy')
+    api files('../libs/oaid_sdk_1.0.25.aar')
 
 }

demo/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.yyxx.commsdk.demo",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.0.1",
+      "outputFile": "demo-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

demo/src/main/AndroidManifest.xml

@@ -56,7 +56,7 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
             />
         <meta-data
-            android:name="yyrh_game_code"
+            android:name="YYXX_COMM_GAME_CODE"
             android:value="100001" />
 
 

demo/src/main/java/com/yyxx/commsdk/demo/DemoActivity.kt

@@ -166,6 +166,12 @@ class DemoActivity : Activity(), View.OnClickListener {
                     YYXXCommSdk.getInstance().charge(this@DemoActivity,getGameChargeRoleInfo(),{code,result->
                         if (code == ResultInfo.CODE_SUCCESS){
 
+                            ToastUtils.toastInfo(this@DemoActivity, "charge code: $code, result: $result")
+
+                        }else{
+
+                            ToastUtils.toastInfo(this@DemoActivity, "charge code: $code, result: $result")
+
                         }
                     })
                 }
@@ -314,7 +320,6 @@ class DemoActivity : Activity(), View.OnClickListener {
     private fun getGameChargeRoleInfo():SdkChargeInfo{
         val chargeInfo = SdkChargeInfo()
         var  time = System.currentTimeMillis() / 1000
-        chargeInfo.count = "10"
         chargeInfo.ext = "$time"
         chargeInfo.game_no = "$time"
         chargeInfo.count = "10"
@@ -324,7 +329,7 @@ class DemoActivity : Activity(), View.OnClickListener {
         chargeInfo.party_name = "霸天"
         chargeInfo.party_id = "11"
         chargeInfo.product_id = "299"
-        chargeInfo.pay_money = "100"
+        chargeInfo.pay_money = mEditText.text.toString()
         chargeInfo.radio = "10"
         chargeInfo.reincarnationCount = "0"
         chargeInfo.product_name = "元宝"
@@ -334,7 +339,7 @@ class DemoActivity : Activity(), View.OnClickListener {
         chargeInfo.server_id = "100"
         chargeInfo.server_name = "惊天1服"
         chargeInfo.vip_level = "0"
-
+        chargeInfo.roleCreateTime = "$time"
         return chargeInfo
     }
 

library_base/src/main/java/cn/yyxx/commsdk/base/entity/Function.java

@@ -17,8 +17,8 @@ public @interface Function {
     String INITIALIZE_SUCCESS = "initializeSuccess";
     String LOGIN = "login";
     String LOGOUT = "logout";
-    String GET_ORDER_INFO = "getOrderInfo";
     String CHARGE = "charge";
+    String START_PAY = "startPay";
     String GET_CHANNEL_ORDER_EXT = "getChannelOrderExt";
     String UPLOAD_ROLE_INFO = "uploadRoleInfo";
 

library_base/src/main/java/cn/yyxx/commsdk/base/entity/bean/InitBean.java

@@ -36,6 +36,8 @@ public class InitBean {
 
     public int bswitch = 0;
 
+    public boolean isSwitchAccount = false;
+
     public int rn_bh = 1800;
 
 
@@ -102,10 +104,12 @@ public class InitBean {
                 ", service_center='" + service_center + '\'' +
                 ", access_token='" + access_token + '\'' +
                 ", agreement_user='" + agreement_user + '\'' +
+                ", isEmulator='" + isEmulator + '\'' +
                 ", links=" + links +
                 ", reg_tabs=" + reg_tabs +
                 ", sdk_login=" + sdk_login +
                 ", bswitch=" + bswitch +
+                ", isSwitchAccount=" + isSwitchAccount +
                 ", rn_bh=" + rn_bh +
                 ", isLandscape=" + isLandscape +
                 ", isShowPhoneRegFrist=" + isShowPhoneRegFrist +

library_base/src/main/java/cn/yyxx/commsdk/base/internal/feature/IOrder.java

@@ -13,18 +13,16 @@ import cn.yyxx.commsdk.base.internal.IRequestCallback;
  */
 public interface IOrder {
 
+
     /**
-     * 获取订单号
-     * 不是所有渠道都需要自定义获取订单号
      *
      * @param activity
-     * @param sdkChargeInfo
-     * @param requestCallback
+     * @param sdkOrderInfo  开始支付所需参数
+     * @param callback  支付结果回调
      */
-    void getOrderInfo(Activity activity, SdkChargeInfo sdkChargeInfo, IRequestCallback requestCallback);
+    void startPay(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback);
 
 
-    void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback);
     /**
      * 获取下单时所需参数
      * @return

library_channel/build.gradle

@@ -36,6 +36,8 @@ dependencies {
     compileOnly project(':library_platform')
 
     compileOnly project(':library_channel_repository')
+    compileOnly project(':library_platform:platform_hnyy')
+
 }
 
 //apply from: 'buildJar.gradle'

library_channel/src/main/java/cn/yyxx/commsdk/impl/ChannelSdkImpl.java

@@ -66,12 +66,10 @@ public class ChannelSdkImpl {
         impl.logout();
     }
 
-    public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
+    public void startPay(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
         if (impl instanceof IOrder) {
-            ((IOrder) impl).charge(activity,sdkOrderInfo,callback);
+            ((IOrder) impl).startPay(activity,sdkOrderInfo,callback);
         }
-
-
     }
 
     public void uploadRoleInfo(Activity activity, String type, SdkRoleInfo roleInfo){

library_channel/src/main/java/cn/yyxx/commsdk/impl/channel/ChannelSdkYYXX.java

@@ -26,7 +26,7 @@ import cn.yyxx.commsdk.platform.PlatformSdk;
  * @author #Suyghur.
  * Created on 2021/12/26
  */
-public class ChannelSdkYYXX implements IFeature, ILifeCycle, IOrder,IApplication {
+public class ChannelSdkYYXX implements IFeature, ILifeCycle,IApplication,IOrder {
 
     private Activity activity;
 
@@ -153,14 +153,11 @@ public class ChannelSdkYYXX implements IFeature, ILifeCycle, IOrder,IApplication
     }
 
     @Override
-    public void getOrderInfo(Activity activity, SdkChargeInfo sdkChargeInfo, IRequestCallback requestCallback) {
-
+    public void startPay(final Activity activity, final SdkOrderInfo sdkOrderInfo, final ICallback callback) {
+        PlatformSdk.getInstance(activity).startPay(activity,sdkOrderInfo,callback);
     }
 
-    @Override
-    public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
-        PlatformSdk.getInstance(activity).charge(activity,sdkOrderInfo,callback);
-    }
+
 
     @Override
     public String getChannelOrderExt() {

library_core/src/main/cpp/tool_kit.cpp

@@ -79,7 +79,7 @@ std::string ToolKit::GetGameCode(JNIEnv *env, jobject context) {
     const char *method_name = "getMetaDataValue";
     const char *sig = "(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;";
     jmethodID mid = env->GetStaticMethodID(clz, method_name, sig);
-    jstring key = env->NewStringUTF("yyrh_game_code");
+    jstring key = env->NewStringUTF("YYXX_COMM_GAME_CODE");
     auto result = (jstring) env->CallStaticObjectMethod(clz, mid, context, key);
     env->DeleteLocalRef(clz);
     env->DeleteLocalRef(key);

library_core/src/main/java/cn/yyxx/commsdk/core/SdkBridge.java

@@ -11,12 +11,13 @@ import java.util.List;
 
 
 import cn.yyxx.commsdk.base.entity.SdkChargeInfo;
-import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
+
 import cn.yyxx.commsdk.base.entity.SdkRoleInfo;
 
 import cn.yyxx.commsdk.base.internal.ICallback;
 
 import cn.yyxx.commsdk.core.impl.SdkBridgeImpl;
+import cn.yyxx.commsdk.core.network.Hosts;
 
 /**
  * @author #Suyghur.
@@ -29,6 +30,7 @@ public final class SdkBridge {
     public SdkBridge(Context context) {
         if (null == impl) {
             impl = new SdkBridgeImpl(context);
+            Hosts.initHost(context);
         }
     }
 
@@ -61,7 +63,7 @@ public final class SdkBridge {
     }
 
     public void charge(Activity activity, SdkChargeInfo chargeInfo, ICallback callback) {
-        impl.getOrderInfo(activity,chargeInfo,callback);
+        impl.charge(activity,chargeInfo,callback);
     }
 
     public void uploadRoleInfo(Activity activity, String type,SdkRoleInfo roleInfo) {

library_core/src/main/java/cn/yyxx/commsdk/core/common/CommonOperationManager.java

@@ -84,12 +84,12 @@ public class CommonOperationManager {
         String isShowPolicy = MMKVUtils.getInstance().commonKV.decodeString("isShowPolicy","");
         if (isShowPolicy.isEmpty()){
 
-            LoadingDialogUtils.getInstance().show(activity);
+//            LoadingDialogUtils.getInstance().show(activity);
             SdkRequest.getInstance().initAgreement(activity, new IRequestCallback() {
                 @Override
                 public void onResponse(ResultInfo resultInfo) {
 
-                    LoadingDialogUtils.getInstance().hide();
+//                    LoadingDialogUtils.getInstance().hide();
 
                     if (resultInfo.code == 400){
                         showExitDialog(activity);
@@ -112,7 +112,7 @@ public class CommonOperationManager {
                         return;
                     }
 
-                    new PrivacyPolicyDialog(activity, policy_url, new PrivacyPolicyDialog.OnClosePageListener() {
+                    new PrivacyPolicyDialog(activity,  ResourceUtil.getStyleId(activity, "yyxx_base_dialog"),policy_url, new PrivacyPolicyDialog.OnClosePageListener() {
                         @Override
                         public void onUserAgreePolicy() {
 

library_core/src/main/java/cn/yyxx/commsdk/core/impl/SdkBridgeImpl.java

@@ -128,7 +128,7 @@ public final class SdkBridgeImpl {
     }
 
 
-    public void getOrderInfo(Activity activity, SdkChargeInfo chargeInfo, ICallback callback) {
+    public void charge(Activity activity, SdkChargeInfo chargeInfo, ICallback callback) {
 
         String  sdk_params = (String) SdkProxyManager.callback(Function.GET_CHANNEL_ORDER_EXT,new Class[]{}, new Object[]{});
         chargeInfo.setSdk_params(sdk_params);
@@ -139,10 +139,10 @@ public final class SdkBridgeImpl {
                     SdkOrderInfo sdkOrderInfo = new SdkOrderInfo();
                     sdkOrderInfo.initOrderInfo(chargeInfo,result);
                     if (sdkOrderInfo.getSdk_pay() == 1){
-                        charge(activity,sdkOrderInfo,callback);
+                        startPay(activity,sdkOrderInfo,callback);
                     }else{
                         if (!TextUtils.isEmpty(sdkOrderInfo.getPay_web_url())){
-                            new CommPayDialog(activity, ResourceUtil.getStyleId(activity, "hnyy_base_dialog"),sdkOrderInfo).show();
+                            new CommPayDialog(activity, ResourceUtil.getStyleId(activity, "yyxx_base_dialog"),sdkOrderInfo).show();
                         }
                     }
                 }else{
@@ -155,10 +155,10 @@ public final class SdkBridgeImpl {
 
 
 
-     public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
+     public void startPay(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
 
 
-         SdkProxyManager.call(Function.CHARGE,  new Class[]{Activity.class,SdkOrderInfo.class,ICallback.class}, new Object[]{activity,sdkOrderInfo,callback});
+         SdkProxyManager.call(Function.START_PAY,  new Class[]{Activity.class,SdkOrderInfo.class,ICallback.class}, new Object[]{activity,sdkOrderInfo,callback});
 
      }
 

library_core/src/main/java/cn/yyxx/commsdk/core/network/Hosts.java

@@ -1,13 +1,13 @@
 package cn.yyxx.commsdk.core.network;
 
-public class Hosts {
+import android.content.Context;
 
-    //    public static final String HOST = "https://sdkapi.yyxxgame.com";
-    public static final String HOST = "http://testsdkapi.yyxxgame.com";
+import cn.yyxx.commsdk.core.utils.ParamsUtils;
 
+public class Hosts {
 
-//        public static final String HOST = "http://49.234.153.160";
 
+    public static String HOST = "";
 
     public static final String  BASIC_URL_INIT_AGREEMENT = "agreement_init";
 
@@ -22,9 +22,12 @@ public class Hosts {
     public static final String  BASIC_URL_PHONE_REGISTER =  "phone_register";
     public static final String  BASIC_URL_PHONE_RESETPWD =   "phone_reset_pwd";
 
-    public static final String  BASIC_URL_ORDER_QUERY = HOST +  "/order_query";
+    public static final String  BASIC_URL_ORDER_QUERY = "order_query";
     public static final String  BASIC_URL_AGREEMENT_INIT = HOST +  "/agreement_init";
     public static final String  BASIC_URL_SMS_LOGIN =   "phone_sms_login";
     public static final String  BASIC_URL_PAYMENTWAY = HOST +  "/payment_way";
+    public static void initHost(Context context){
+        HOST = ParamsUtils.getHost(context);
+    }
     
 }

library_core/src/main/java/cn/yyxx/commsdk/core/network/SdkRequest.java

@@ -43,8 +43,10 @@ public class SdkRequest {
     }
 
     public void initAgreement(Context context, IRequestCallback callback) {
-        String game_code = PropertiesUtils.getValue4Properties(context, "yyxx_cfg.properties", "yyxx_game", "YYXX_GAME_CODE");
-        String gcp_code = ManifestUtils.getMetaDataValue(context, "gcp_code");
+        String game_code =  ManifestUtils.getMetaDataValue(context, "YYXX_COMM_GAME_CODE");
+
+        String gcp_code =   PropertiesUtils.getValue4Properties(context, "yyxx_cfg.properties", "yyxx_game", "YYXX_GCP_CODE");
+
         JSONObject json = new JSONObject();
         try {
             json.put("game_code", game_code);
@@ -276,6 +278,7 @@ public class SdkRequest {
     public void queryOrder(Context context, String order_id,String query_params, IRequestCallback callback) {
         JSONObject json = new JSONObject();
         try {
+            json.put("route_path", Hosts.BASIC_URL_ORDER_QUERY);
             json.put("order_id",order_id);
             json.put("query_params",query_params);
         } catch (JSONException e) {

library_core/src/main/java/cn/yyxx/commsdk/core/network/VolleyRequest.java

@@ -38,9 +38,8 @@ public class VolleyRequest {
         try {
 
             Logger.logHandler("请求地址 : " + url + "\n");
-            Logger.logHandler("请求参数 : " + params.toString() + "\n");
+            Logger.logHandler("请求参数 : " + params + "\n");
             Logger.d("请求地址 : " + url);
-            Logger.d("请求参数 : " + params.toString());
 
             StringRequest request = new StringRequest(Request.Method.POST,Hosts.HOST, new Response.Listener<String>() {
                 @Override

library_core/src/main/java/cn/yyxx/commsdk/core/ui/dialog/CommPayDialog.java

@@ -28,7 +28,7 @@ public class CommPayDialog extends Dialog implements View.OnClickListener{
     private Context context;
     private WebView webView;
     private WebSettings webSettings;
-    private String orderId;
+
     private ImageView iv_reback_close;
     private SdkOrderInfo sdkOrderInfo;
 
@@ -78,10 +78,6 @@ public class CommPayDialog extends Dialog implements View.OnClickListener{
             public void zfColse() {   //提供给js调用的方法
                 dismiss();
             }
-            @JavascriptInterface
-            public void zfOrder(String message) {
-                orderId = message;
-            }
         }, "yyrhsdk");
 
         webView.setHorizontalScrollBarEnabled(false);//水平不显示

library_core/src/main/java/cn/yyxx/commsdk/core/ui/dialog/PrivacyPolicyDialog.java

@@ -25,8 +25,11 @@ public class PrivacyPolicyDialog extends Dialog {
     String url;
     private Button btn_disagree,btn_agree;
 
-     public PrivacyPolicyDialog(Context context,String url,OnClosePageListener listener) {
+    public PrivacyPolicyDialog(Context context) {
         super(context);
+    }
+    public PrivacyPolicyDialog(Context context,int theme,String url,OnClosePageListener listener) {
+        super(context,theme);
         this.context = context;
         this.url = url;
         this.listener = listener;

library_core/src/main/java/cn/yyxx/commsdk/core/utils/ParamsUtils.java

@@ -6,13 +6,22 @@ import cn.yyxx.support.PropertiesUtils;
 
 public class ParamsUtils {
     private static String  CONFIG_FILE  =  "yyxx_cfg.properties";
-    private static String  YYXX_GAME_CODE  =  "YYXX_GAME_CODE";
+    private static String  YYXX_COMM_GAME_CODE  =  "YYXX_COMM_GAME_CODE";
     private static String  YYXX_GCP_CODE  =  "YYXX_GCP_CODE";
+
+    private static String  YYXX_ONLINE_ENV  =  "YYXX_ONLINE_ENV";
+
+
     private static String ASSETS_PATH = "yyxx_game";
     public static String getGameCode(Context context){
-         return PropertiesUtils.getValue4Properties(context,CONFIG_FILE,ASSETS_PATH,YYXX_GAME_CODE);
+
+         return ManifestUtils.getMetaDataValue(context,YYXX_COMM_GAME_CODE);
     }
     public static String getGcpCode(Context context){
         return PropertiesUtils.getValue4Properties(context,CONFIG_FILE,ASSETS_PATH,YYXX_GCP_CODE);
     }
+    public static String getHost(Context context){
+        return PropertiesUtils.getValue4Properties(context,CONFIG_FILE,ASSETS_PATH, YYXX_ONLINE_ENV);
+
+    }
 }

library_core/src/main/res/layout/yyxx_comm_p_webview.xml

@@ -2,8 +2,7 @@
     android:layout_width="360dp"
     android:layout_height="320dp"
     android:gravity="center"
-    android:background="@drawable/yyxx_comm_background"
-    android:orientation="vertical"
+     android:orientation="vertical"
     android:id="@+id/ll_p_wb"
     >
         <RelativeLayout
@@ -16,16 +15,14 @@
                 android:id="@+id/wb_with_xd"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="none"
-                android:layout_margin="10dp"
-                />
+                android:scrollbars="none" />
 
             <ImageView
                 android:id="@+id/iv_reback_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
                 android:padding="10dp"
                 android:src="@mipmap/yyxx_comm_close"
                 android:layout_alignParentRight="true"

library_core/src/main/res/layout/yyxx_comm_privacy_dialog.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="360dp"
     android:layout_height="280dp"
-    android:background="@drawable/yyxx_comm_background"
+    android:background="@color/yyxx_comm_white"
     android:orientation="vertical"
     android:id="@+id/ll_private_policy"
     >
@@ -16,13 +16,13 @@
     android:layout_marginLeft="2dp"
     android:layout_marginRight="2dp"
     >
-        <WebView
-            android:id="@+id/wb_user_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:background="@color/yyxx_comm_transparent"
-            />
+
+    <WebView
+        android:id="@+id/wb_user_info"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:background="@color/yyxx_comm_transparent" />
 </RelativeLayout>
     <LinearLayout
         android:layout_width="match_parent"

library_core/src/main/res/values/yyxx_comm_strings.xml

@@ -7,7 +7,7 @@
     <string name="yyxx_comm_title_tip">温馨提示</string>
     <string name="yyxx_comm_confirm">确定</string>
     <string name="yyxx_comm_network_error_tip">网络出错，请检查网络</string>
-    <string name="yyxx_comm_params_error_tip">参数异常，请检查yyxx_cfg.properties中的YYXX_GAME_CODE值</string>
+    <string name="yyxx_comm_params_error_tip">参数异常，请检查AndroidManifest.xml中的YYXX_COMM_GAME_CODE值</string>
     <string name="yyxx_comm_initing">正在初始化...</string>
     <string name="yyxx_comm_init_success">初始化成功</string>
     <string name="yyxx_comm_init_fail">初始化失败</string>

library_core/src/main/res/values/yyxx_comm_styles.xml

@@ -7,6 +7,20 @@
 
 
 
+    <style name="yyxx_privacy_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <!-- 边框 -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 是否浮现在activity之上 -->
+        <item name="android:windowIsTranslucent">false</item>
+        <!-- 半透明 -->
+        <item name="android:windowNoTitle">false</item>
+        <!-- 无标题 -->
+        <item name="android:windowBackground">@color/yyxx_comm_transparent</item>
+
+
+        <!-- 模糊 -->
+    </style>
 
 
     <style name="yyxx_base_dialog" parent="@android:style/Theme.Dialog">

library_platform/platform_hnyy/build.gradle

@@ -22,6 +22,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
 }
 
 dependencies {

demo/src/main/assets/yyxx_game/yyxx_cfg.properties → library_platform/platform_hnyy/src/main/assets/yyxx_game/yyxx_cfg.properties

@@ -1,4 +1,4 @@
-YYXX_GAME_CODE=100001
 YYXX_GCP_CODE=Y0101025
+YYXX_SP_CODE=
 YYXX_ONLINE_ENV=http://testsdkapi.yyxxgame.com
 YYXX_PLATFORM=HNYY

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/SdkPlatformBridge.java

@@ -22,7 +22,7 @@ import cn.yyxx.commsdk.base.internal.feature.ILifeCycle;
 import cn.yyxx.commsdk.base.internal.feature.IOrder;
 import cn.yyxx.commsdk.platform.hnyy.impl.SdkPlatformImpl;
 
-public class SdkPlatformBridge implements IFeature, ILifeCycle, IOrder, IApplication {
+public class SdkPlatformBridge implements IFeature, ILifeCycle, IApplication {
 
     private SdkPlatformImpl impl = null;
 
@@ -150,16 +150,11 @@ public class SdkPlatformBridge implements IFeature, ILifeCycle, IOrder, IApplica
         impl.onCreate(activity,savedInstanceState);
     }
 
-    @Override
-    public void getOrderInfo(Activity activity, SdkChargeInfo sdkChargeInfo, IRequestCallback requestCallback) {
-    }
 
-    @Override
-    public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
-        impl.charge(activity,sdkOrderInfo,callback);
+    public void startPay(Activity activity, SdkOrderInfo sdkOrderInfo,ICallback callback) {
+        impl.startPay(activity,sdkOrderInfo,callback);
     }
 
-    @Override
     public String getChannelOrderExt() {
         return  impl.getChannelOrderExt();
     }

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/HNYYLoginActivity.java

@@ -15,7 +15,6 @@ import cn.yyxx.commsdk.base.internal.ICallback;
 
 import cn.yyxx.commsdk.platform.LoginViewModel;
 import cn.yyxx.commsdk.platform.hnyy.dialog.AutoLoginDialog;
-import cn.yyxx.commsdk.platform.hnyy.floating.FloatViewManager;
 import cn.yyxx.commsdk.platform.hnyy.fragment.UserAccountLoginFragment;
 import cn.yyxx.commsdk.platform.hnyy.fragment.UserPhoneLoginFragment;
 import cn.yyxx.commsdk.platform.hnyy.fragment.UserPhoneLoginSetpwdFragment;
@@ -42,6 +41,8 @@ public class HNYYLoginActivity extends BaseLoginActivity {
 
     public static LoginViewModel loginViewModel;
 
+
+
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -60,7 +61,13 @@ public class HNYYLoginActivity extends BaseLoginActivity {
         containerId = ResUtils.getResId(this, "hnyy_login_container", "id");
         initView(this);
         if (UserSessionManager.getInstance().getLocalLastSession() != null){
-            autoLogin(this);
+            if (SdkPlatformImpl.initConfig.isSwitchAccount){
+                switchFragment(HNYYLoginFragmentTag.PAGE_SWITCH_ACCOUNT_LOGIN,null);
+
+            }else{
+                autoLogin(this);
+            }
+
         }else{
             if (SdkPlatformImpl.initConfig.isShowPhoneRegFrist){
                 switchFragment(HNYYLoginFragmentTag.PAGE_PHONE_LOGIN,null);

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/dialog/HnPayDialog.java

@@ -5,6 +5,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.webkit.DownloadListener;
 import android.webkit.WebChromeClient;
@@ -15,10 +18,17 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.HashMap;
 
+import cn.yyxx.commsdk.base.entity.ResultInfo;
 import cn.yyxx.commsdk.base.entity.SdkOrderInfo;
+import cn.yyxx.commsdk.base.internal.ICallback;
+import cn.yyxx.commsdk.base.internal.IRequestCallback;
+import cn.yyxx.commsdk.base.utils.Logger;
+import cn.yyxx.commsdk.core.network.SdkRequest;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.platform.hnyy.action.PageJsInteraction;
 import cn.yyxx.commsdk.platform.hnyy.fragment.widget.TosUtil;
@@ -34,13 +44,14 @@ public class HnPayDialog extends JsBaseDialog implements View.OnClickListener{
     private String orderId;
     private ImageView iv_reback_close;
     private SdkOrderInfo sdkOrderInfo;
+    private ICallback payCallBack;
 
 
-
-    public HnPayDialog(Context context, int theme, SdkOrderInfo sdkOrderInfo) {
+    public HnPayDialog(Context context, int theme, SdkOrderInfo sdkOrderInfo,ICallback callback) {
         super(context, theme);
         this.context = context;
         this.sdkOrderInfo = sdkOrderInfo;
+        this.payCallBack = callback;
 
     }
     @Override
@@ -147,7 +158,20 @@ public class HnPayDialog extends JsBaseDialog implements View.OnClickListener{
     @Override
     public void dismiss() {
         super.dismiss();
+        if (!TextUtils.isEmpty(orderId)){
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    SdkRequest.getInstance().queryOrder(context, orderId, sdkOrderInfo.getQuery_params(), new IRequestCallback() {
+                        @Override
+                        public void onResponse(ResultInfo resultInfo) {
+                            payCallBack.onResult(resultInfo.code,resultInfo.data);
+                         }
+                    });
+                }
+            },5000);
 
+        }
     }
 
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/dialog/UserCenterDialog.java

@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.platform.hnyy.action.PageJsInteraction;
 import cn.yyxx.commsdk.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.platform.hnyy.impl.SdkPlatformImpl;
 import cn.yyxx.support.AppUtils;
 
 
@@ -247,7 +248,7 @@ public class UserCenterDialog extends JsBaseDialog {
     public void switchAccount() {
         super.switchAccount();
         dismiss();
-
+        SdkPlatformImpl.getInstance(context).logout();
     }
 
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/floating/FloatViewManager.java

@@ -11,6 +11,7 @@ import android.graphics.BitmapFactory;
 import cn.yyxx.commsdk.core.entity.SdkLoginInfo;
 import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.platform.hnyy.dialog.UserCenterDialog;
+import cn.yyxx.commsdk.platform.hnyy.impl.SdkPlatformImpl;
 
 public class FloatViewManager {
 
@@ -32,6 +33,7 @@ public class FloatViewManager {
 
     public static FloatViewManager getInstance(Activity activity) {
 
+
         if (manager == null) {
             synchronized (FloatViewManager.class) {
                 if (manager == null) {
@@ -60,7 +62,7 @@ public class FloatViewManager {
 
                                 return;
                             }
-                            String  info = SdkLoginInfo.getInstance().toString();
+
                             clickLoginTime = System.currentTimeMillis();
                             new UserCenterDialog(activity,ResourceUtil.getStyleId(activity,"hnyy_half_black_dialog"), SdkLoginInfo.getInstance().user_center).show();
                         }
@@ -73,15 +75,24 @@ public class FloatViewManager {
     }
 
     public void showFloat() {
+
         builder.show();
     }
 
 
     public void hideFloat() {
-        builder.hide();
+        if (builder != null){
+            builder.hide();
+        }
+
     }
 
-    public void releaseFloat(){builder.release();}
+    public void releaseFloat(){
+
+        if (builder != null){
+            builder.release();
+        }
+    }
 
 
 }

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/fragment/UserAccountLoginFragment.java

@@ -28,6 +28,7 @@ import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.platform.hnyy.HNYYLoginFragmentTag;
 import cn.yyxx.commsdk.platform.hnyy.adapter.UserListAdapter;
 import cn.yyxx.commsdk.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.platform.hnyy.impl.SdkPlatformImpl;
 import cn.yyxx.commsdk.platform.user.UserSession;
 import cn.yyxx.commsdk.platform.user.UserSessionManager;
 
@@ -224,6 +225,7 @@ public class UserAccountLoginFragment extends BaseFragment {
 
                     if (!getActivity().isFinishing()) {
                         getActivity().finish();
+                        SdkPlatformImpl.getInstance(getActivity()).showFloat();
                     }
 
                  }else{

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/fragment/UserPhoneLoginFragment.java

@@ -165,7 +165,9 @@ public class UserPhoneLoginFragment extends BaseFragment {
 
                     if (!getActivity().isFinishing()) {
                         getActivity().finish();
-                }
+                        SdkPlatformImpl.getInstance(getActivity()).showFloat();
+
+                    }
 
             }
 

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/fragment/UserPhoneLoginSetpwdFragment.java

@@ -149,6 +149,8 @@ public class UserPhoneLoginSetpwdFragment extends BaseFragment {
                 if (code == ResultInfo.CODE_SUCCESS){
                     if (!getActivity().isFinishing()) {
                         getActivity().finish();
+                        SdkPlatformImpl.getInstance(getActivity()).showFloat();
+
                     }
 
                 }else{

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/fragment/UserRegisterFragment.java

@@ -196,6 +196,8 @@ public class UserRegisterFragment extends BaseFragment {
 
                     if (!getActivity().isFinishing()) {
                         getActivity().finish();
+                        SdkPlatformImpl.getInstance(getActivity()).showFloat();
+
                     }
 
                 }else{

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/fragment/UserSwitchAccountLoginFragment.java

@@ -19,6 +19,7 @@ import cn.yyxx.commsdk.core.utils.ResourceUtil;
 import cn.yyxx.commsdk.platform.hnyy.HNYYLoginFragmentTag;
 import cn.yyxx.commsdk.platform.hnyy.fragment.widget.AccountLoginListView;
 import cn.yyxx.commsdk.platform.hnyy.fragment.widget.TosUtil;
+import cn.yyxx.commsdk.platform.hnyy.impl.SdkPlatformImpl;
 import cn.yyxx.commsdk.platform.user.UserSession;
 import cn.yyxx.commsdk.platform.user.UserSessionManager;
 
@@ -142,6 +143,7 @@ public class UserSwitchAccountLoginFragment extends BaseFragment{
                 if (code == ResultInfo.CODE_SUCCESS){
                     if (!getActivity().isFinishing()) {
                         getActivity().finish();
+                        SdkPlatformImpl.getInstance(getActivity()).showFloat();
                     }
 
                 }else{

library_platform/platform_hnyy/src/main/java/cn/yyxx/commsdk/platform/hnyy/impl/SdkPlatformImpl.java

@@ -31,7 +31,7 @@ import cn.yyxx.commsdk.platform.hnyy.dialog.CustomExitGameDialog;
 import cn.yyxx.commsdk.platform.hnyy.dialog.HnPayDialog;
 import cn.yyxx.commsdk.platform.hnyy.floating.FloatViewManager;
 
-public class SdkPlatformImpl implements IFeature, ILifeCycle, IOrder, IApplication {
+public class SdkPlatformImpl implements IFeature, ILifeCycle, IApplication {
     public static InitBean initConfig = null ;
 
     private static SdkPlatformImpl manager;
@@ -41,6 +41,8 @@ public class SdkPlatformImpl implements IFeature, ILifeCycle, IOrder, IApplicati
 
     private Context context;
 
+
+
     private static Activity activity;
     public SdkPlatformImpl(Context context){
         this.context = context;
@@ -81,6 +83,7 @@ public class SdkPlatformImpl implements IFeature, ILifeCycle, IOrder, IApplicati
     public void logout() {
         SdkLoginInfo.getInstance().reset();
         hideFloat();
+        initConfig.isSwitchAccount = true;
     }
 
 
@@ -198,30 +201,76 @@ public class SdkPlatformImpl implements IFeature, ILifeCycle, IOrder, IApplicati
 
 
     public void showFloat(){
-        FloatViewManager.getInstance(activity).showFloat();
+        if (!initConfig.isOpenFloatView){
+            return ;
+        }
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                FloatViewManager.getInstance(activity).showFloat();
+            }
+        });
+
     }
     public void hideFloat(){
-        FloatViewManager.getInstance(activity).hideFloat();
+
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                FloatViewManager.getInstance(activity).hideFloat();
+            }
+        });
     }
     public void releaseFloat(){
-        FloatViewManager.getInstance(activity).releaseFloat();
-    }
 
-    @Override
-    public void getOrderInfo(Activity activity, SdkChargeInfo sdkChargeInfo, IRequestCallback requestCallback) {
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                FloatViewManager.getInstance(activity).releaseFloat();
+            }
+        });
+
+
 
     }
 
-    @Override
-    public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
+
+    public void startPay(Activity activity, SdkOrderInfo sdkOrderInfo, final ICallback callback) {
+
         if (!TextUtils.isEmpty(sdkOrderInfo.getPay_web_url())){
-            new HnPayDialog(activity, ResourceUtil.getStyleId(activity, "hnyy_base_dialog"),sdkOrderInfo).show();
+
+            new HnPayDialog(activity, ResourceUtil.getStyleId(activity, "hnyy_base_dialog"), sdkOrderInfo, new ICallback() {
+                @Override
+                public void onResult(int code, String result) {
+                    if (code  == ResultInfo.CODE_SUCCESS){
+                        try {
+                            JSONObject json = new JSONObject(result);
+                            int order_status = json.optInt("order_status",0);
+                            if (order_status == ResultInfo.CODE_SUCCESS){
+                                callback.onResult(ResultInfo.CODE_SUCCESS,"支付成功");
+                            }else{
+
+                                callback.onResult(ResultInfo.CODE_FAIL,"支付取消");
+
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }else{
+
+                        callback.onResult(ResultInfo.CODE_ERROR,"订单查询失败");
+
+                    }
+                }
+            }).show();
 
         }
 
     }
 
-    @Override
+
+
+
     public String getChannelOrderExt() {
         return "";
     }

library_platform/src/main/java/cn/yyxx/commsdk/platform/PlatformSdk.java

@@ -30,7 +30,7 @@ import cn.yyxx.commsdk.base.internal.feature.IOrder;
  * @author #Suyghur.
  * Created on 2021/12/25
  */
-public class PlatformSdk implements IFeature,ILifeCycle, IOrder, IApplication {
+public class PlatformSdk implements IFeature,ILifeCycle, IApplication,IOrder {
 
     private static PlatformSdk platformSdk;
 
@@ -223,14 +223,11 @@ public class PlatformSdk implements IFeature,ILifeCycle, IOrder, IApplication {
     }
 
     @Override
-    public void getOrderInfo(Activity activity, SdkChargeInfo sdkChargeInfo, IRequestCallback requestCallback) {
+    public void startPay(final Activity activity, final SdkOrderInfo sdkOrderInfo, ICallback callback) {
 
-    }
+        SdkProxyOperationManager.call(Function.START_PAY, new Class[]{Activity.class, SdkOrderInfo.class,ICallback.class}, new Object[]{activity, sdkOrderInfo,callback});
 
-    @Override
-    public void charge(Activity activity, SdkOrderInfo sdkOrderInfo, ICallback callback) {
-        SdkProxyOperationManager.call(Function.CHARGE, new Class[]{Activity.class, SdkOrderInfo.class,ICallback.class}, new Object[]{activity, sdkOrderInfo,callback});
-     }
+    }
 
     @Override
     public String getChannelOrderExt() {