v1.0.0开发：sdk浮标开发

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     // ndk版本
     ext.NDK_VERSION = '21.3.6528147'
     // kotlin版本
-    ext.KOTLIN_VERSION = '1.4.20'
+    ext.KOTLIN_VERSION = '1.5.10'
     // compileSdkVersion
     ext.COMPILE_SDK_VERSION = 30
     // buildToolsVersion

demo/src/main/java/com/yyxxgame/columbus/DemoActivity.kt

@@ -12,7 +12,9 @@ import android.widget.*
 import cn.yyxx.eyuangame.base.EYuanGame
 import cn.yyxx.eyuangame.base.internal.ICallback
 import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.eyuangame.core.entity.FloatFeature
 import cn.yyxx.eyuangame.core.impl.SdkDrive
+import cn.yyxx.eyuangame.core.impl.floating.FloatCenterItem
 import cn.yyxx.support.hawkeye.LogUtils
 import kotlin.system.exitProcess
 
@@ -69,6 +71,8 @@ class DemoActivity : Activity(), View.OnClickListener {
             text = ""
             this@DemoActivity.layout.addView(this)
         }
+        val itemView = FloatCenterItem(this, "", FloatFeature.FEATURE_MEMBER)
+        layout.addView(itemView)
         val scrollView = ScrollView(this)
         scrollView.addView(layout)
         setContentView(scrollView)

library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGame.kt

@@ -293,10 +293,6 @@ class EYuanGame private constructor() {
             return
         }
 
-        if (checkSdkNonInit(Function.OPEN_EXIT_VIEW, null)) {
-            return
-        }
-
         SdkBridgeManager.call(
             Function.OPEN_EXIT_VIEW,
             arrayOf(Activity::class.java, ICallback::class.java),
@@ -409,8 +405,8 @@ class EYuanGame private constructor() {
 
     private fun checkSdkNonInit(function: String, callback: ICallback?): Boolean {
         return if (!doSdkInit) {
-            Logger.e("invoke $function error ... Columbus not initialized yet")
-            callback?.onResult(-1, "Columbus 还未进行初始化")
+            Logger.e("invoke $function error ... EYuanGameSdk not initialized yet")
+            callback?.onResult(-1, "EYuanGameSdk 还未进行初始化")
             true
         } else {
             false

library_core/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.yyxx.columbus.core">
+    package="cn.yyxx.eyuangame.core">
 
     <!-- 网络权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -18,7 +18,7 @@
         android:usesCleartextTraffic="true">
 
         <activity
-            android:name="cn.yyxx.eyuangame.core.impl.login.LoginActivity"
+            android:name=".impl.login.LoginActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:imeOptions="flagNoFullscreen|flagNoExtractUi"
             android:launchMode="singleTask"
@@ -26,6 +26,9 @@
             android:windowSoftInputMode="adjustResize|stateHidden|stateVisible" />
 
 
+        <service
+            android:name=".impl.floating.FloatCenterService"
+            android:exported="true" />
     </application>
 
 </manifest>

library_core/src/main/cpp/sdk_drive.cpp

@@ -53,7 +53,7 @@ static jstring InvokeJob(JNIEnv *env, jobject thiz, jobject context, jstring key
 //    memset(key64,0,64);
 //    sprintf(key64,"%s%s",md5_key,reverse(md5_key.begin(),md5_key.end()))
 //    std::string  aes_key=md5()
-    LOGD("test : %s", ToolKit::StrReverse(key_));
+//    LOGD("test : %s", ToolKit::StrReverse(key_));
     char *p = AesUtils::Encrypt(ToolKit::ToJsonString(root).c_str(), reinterpret_cast<const uint8_t *>(key_));
     jstring result = ToolKit::GetJString(env, p);
     env->ReleaseStringUTFChars(key, key_);

library_core/src/main/cpp/toolkit.cpp

@@ -246,14 +246,15 @@ Json::Value ToolKit::ToJsonObject(const std::string &json) {
 char *ToolKit::StrReverse(const char *src) {
     char *tmp = new char[strlen(src)];
     strcpy(tmp, src);
-    char *ret = tmp;//用来最后返回数组指针
+    //用来最后返回数组指针
+    char *ret = tmp;
     char *p = tmp + strlen(src) - 1;
     while (p > tmp) {
         char t = *tmp;
         *tmp++ = *p;
         *p-- = t;
     }
-    free(p);
+//    free(p);
     return ret;
 }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/entity/FloatFeature.kt

@@ -0,0 +1,13 @@
+package cn.yyxx.eyuangame.core.entity
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/29
+ */
+enum class FloatFeature {
+    FEATURE_MEMBER,
+    FEATURE_GIF,
+    FEATURE_GM,
+    FEATURE_CHARGE,
+    FEATURE_INVITE
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkBridgeImpl.kt

@@ -14,6 +14,8 @@ import cn.yyxx.eyuangame.base.utils.ParamsUtils
 import cn.yyxx.eyuangame.core.entity.ResultInfo
 import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.entity.bean.init.InitBean
+import cn.yyxx.eyuangame.core.impl.floating.FloatCenterServiceManager
+import cn.yyxx.eyuangame.core.impl.iab.ChargeImpl
 import cn.yyxx.eyuangame.core.impl.login.LoginActivity
 import cn.yyxx.eyuangame.core.internal.IImplCallback
 import cn.yyxx.eyuangame.core.internal.IRequestCallback
@@ -21,6 +23,7 @@ import cn.yyxx.eyuangame.core.network.Host
 import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.eyuangame.core.ui.dialog.TipsDialog
 import cn.yyxx.eyuangame.core.utils.MMKVUtils
+import cn.yyxx.support.BeanUtils
 import cn.yyxx.support.DensityUtils
 import cn.yyxx.support.ResUtils
 import cn.yyxx.support.device.DeviceInfoUtils
@@ -68,7 +71,7 @@ class SdkBridgeImpl(context: Context) {
     fun attachBaseContext(application: Application, context: Context) {
         Logger.initZap(application)
         SdkDrive.instance.initSdkDrive(application)
-        Logger.i("Columbus attachBaseContext ...")
+        Logger.i("EYuanGameSdk attachBaseContext ...")
         GAIDUtils.initGoogleAdid(application) { code, _ ->
             if (code == 0) {
                 Logger.i("谷歌框架可以访问，请求gaid")
@@ -82,13 +85,14 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun initApplication(application: Application) {
-        Logger.i("Columbus initApplication ...")
+        Logger.i("EYuanGameSdk initApplication ...")
         MMKVUtils.instance.init(application)
     }
 
     fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback, initCallback: IInitialize) {
-        Logger.i("Columbus initialize ...")
+        Logger.i("EYuanGameSdk initialize ...")
         isLand = isLandscape
+        this.mActivity = activity
         if (TextUtils.isEmpty(ParamsUtils.getGcpCode(activity))) {
             Logger.e("初始化失败，参数异常，请检查yyxx_cfg.properties中YYXX_GCP_CODE的值")
             initCallback.onResult(-1, "初始化失败，参数异常，请检查yyxx_cfg.properties中YYXX_GAME_CODE的值")
@@ -149,6 +153,7 @@ class SdkBridgeImpl(context: Context) {
                     initBean = InitBean.toBean(resultInfo.data)
                     //TODO 下载图片资源
                     showInitDialog(activity, callback, initCallback)
+                    FloatCenterServiceManager.instance.init(activity)
                 } else {
                     initState = false
                     initCallback.onResult(-1, "SDK初始化失败")
@@ -166,6 +171,7 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun login(activity: Activity, isAutoLogin: Boolean, callback: ICallback) {
+        Logger.i("EYuanGameSdk login ...")
         this.mActivity = activity
         if (!initState) {
             Logger.e("登录失败，SDK未初始化或初始化失败")
@@ -216,6 +222,7 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun logout(activity: Activity, callback: ICallback) {
+        Logger.i("EYuanGameSdk logout ...")
         this.mActivity = activity
         this.roleInfo = null
         SdkBackLoginInfo.instance.reset()
@@ -223,27 +230,64 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun charge(activity: Activity, chargeInfo: SdkChargeInfo, callback: ICallback) {
+        Logger.i("EYuanGameSdk charge ...")
         this.mActivity = activity
         if (!initState) {
             Logger.e("支付失败，SDK未初始化或初始化失败")
             callback.onResult(-1, "支付失败，SDK未初始化或初始化失败")
             return
         }
+        if (TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
+            Logger.e("支付失败，用户未登录或登录失败")
+            callback.onResult(-1, "支付失败，用户未登录或登录失败")
+            return
+        }
+        if (!isSubmitRoleData) {
+            Logger.e("支付失败，角色未登录或登录失败")
+            callback.onResult(-1, "支付失败，角色未登录或登录失败")
+            return
+        }
+        if (!DeviceInfoUtils.isNetworkConnected(activity)) {
+            Logger.e("当前网络连接异常，请重试")
+            callback.onResult(-1, "当前网络连接异常，请重试")
+            return
+        }
+
+        val innerChargeInfo = BeanUtils.deepClone(chargeInfo)
+        if (innerChargeInfo == null) {
+            Logger.e("支付失败，支付信息对象拷贝过程异常")
+            callback.onResult(-1, "支付失败，支付信息对象拷贝过程异常")
+            return
+        }
+        ChargeImpl.instance.charge(activity, innerChargeInfo, object : IImplCallback {
+            override fun onResult(code: Int, result: String) {
+                callback.onResult(code, result)
+            }
+        })
     }
 
     fun roleCreate(activity: Activity, roleInfo: SdkRoleInfo) {
+        Logger.i("EYuanGameSdk roleCreate ...")
+        this.mActivity = activity
+
 
     }
 
     fun roleLauncher(activity: Activity, roleInfo: SdkRoleInfo) {
+        Logger.i("EYuanGameSdk roleLauncher ...")
+        this.mActivity = activity
 
     }
 
     fun roleLevelUp(activity: Activity, roleInfo: SdkRoleInfo) {
+        Logger.i("EYuanGameSdk roleLevelUp ...")
+        this.mActivity = activity
 
     }
 
     fun openExitView(activity: Activity, callback: ICallback) {
+        Logger.i("EYuanGameSdk openExitView ...")
+        this.mActivity = activity
         exitDialog?.apply {
             dismiss()
             exitDialog = null
@@ -273,47 +317,62 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun onStart(activity: Activity) {
+        Logger.i("EYuanGameSdk onStart ...")
+        this.mActivity = activity
 
     }
 
     fun onRestart(activity: Activity) {
+        Logger.i("EYuanGameSdk onRestart ...")
+        this.mActivity = activity
 
     }
 
     fun onResume(activity: Activity) {
+        Logger.i("EYuanGameSdk onResume ...")
+        this.mActivity = activity
+        FloatCenterServiceManager.instance.show()
 
     }
 
     fun onPause(activity: Activity) {
+        Logger.i("EYuanGameSdk onPause ...")
+        this.mActivity = activity
+        FloatCenterServiceManager.instance.hide()
 
     }
 
     fun onStop(activity: Activity) {
-
+        Logger.i("EYuanGameSdk onStop ...")
+        this.mActivity = activity
     }
 
     fun onDestroy(activity: Activity) {
-
+        Logger.i("EYuanGameSdk onDestroy ...")
+        this.mActivity = activity
+        FloatCenterServiceManager.instance.release()
     }
 
     fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, intent: Intent) {
+        Logger.i("EYuanGameSdk onActivityResult ...")
+        this.mActivity = activity
 
     }
 
     fun onNewIntent(activity: Activity, intent: Intent) {
+        Logger.i("EYuanGameSdk onNewIntent ...")
+        this.mActivity = activity
 
     }
 
     fun getCurrentUserId(): String {
+        Logger.i("EYuanGameSdk getCurrentUserId ...")
         return SdkBackLoginInfo.instance.userId
     }
 
     companion object {
-
         var isLand = false
-
         lateinit var initBean: InitBean
-
     }
 
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floating/FloatCenter.kt

@@ -0,0 +1,192 @@
+package cn.yyxx.eyuangame.core.impl.floating
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.support.DensityUtils
+import cn.yyxx.support.ResUtils
+import cn.yyxx.support.ui.DragViewLayout
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/28
+ */
+class FloatCenter(val activity: Activity, private val features: MutableList<FloatCenterItem>) : DragViewLayout(activity), View.OnClickListener {
+
+    private lateinit var view: LinearLayout
+
+    //    private lateinit var leftView: View
+//    private lateinit var rightView: View
+//    private lateinit var leftMenu: LinearLayout
+//    private lateinit var rightMenu: LinearLayout
+    private lateinit var menu: LinearLayout
+    private lateinit var icon: ImageView
+    private var menuWidth = 0
+    private var menuHeight = 0
+    private var iconWidth = 0
+    private var iconHeight = 0
+    private var isShowMenu = false
+
+    init {
+        isClickable = true
+//        val params = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+//        params.height = DensityUtils.dip2px(activity, 40.0f)
+//        params.width = DensityUtils.dip2px(activity, 40.0f)
+        initView(activity)
+    }
+
+
+    private fun initView(context: Context) {
+//        view = LayoutInflater.from(context).inflate(ResUtils.getResId(context, "yyxx_float_menu", "layout"), null)
+//        rightView = LayoutInflater.from(context).inflate(ResUtils.getResId(context, "yyxx_float_right_menu", "layout"), null)
+
+//        val imageView = ImageView(activity)
+//        imageView.setImageResource(ResUtils.getResId(activity, "yyxx_float_icon_img", "drawable"))
+//        imageView.setOnClickListener(this)
+        iconWidth = DensityUtils.dip2px(context, 40f)
+        iconHeight = DensityUtils.dip2px(context, 40f)
+        Logger.d("width : ${features[0].width}")
+        menuWidth = DensityUtils.dip2px(context, 30f) * features.size + iconWidth / 2
+        menuHeight = iconHeight
+
+        view = LinearLayout(context)
+        view.apply {
+            orientation = LinearLayout.HORIZONTAL
+            val params = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+            layoutParams = params
+        }
+
+        icon = ImageView(context)
+        icon.apply {
+            setBackgroundResource(ResUtils.getResId(context, "yyxx_float_logo_img", "drawable"))
+            val params = LayoutParams(iconWidth, iconHeight)
+            layoutParams = params
+            setOnClickListener(this@FloatCenter)
+        }
+
+        menu = LinearLayout(context)
+        menu.apply {
+            orientation = LinearLayout.HORIZONTAL
+//            setBackgroundColor(Color.TRANSPARENT)
+            val params = LayoutParams(menuWidth, menuHeight)
+            layoutParams = params
+        }
+
+//        leftMenu = view.findViewById(ResUtils.getResId(context, "yyxx_left_menu", "id"))
+//        leftMenu.layoutParams = LayoutParams(menuWidth, menuHeight)
+//        leftVview.visibility = View.GONE
+
+//        rightMenu = view.findViewById(ResUtils.getResId(context, "yyxx_right_menu", "id"))
+//        rightMenu.layoutParams = LayoutParams(menuWidth, menuHeight)
+//        rightView.visibility = View.GONE
+
+//        icon = view.findViewById(ResUtils.getResId(context, "yyxx_iv_icon", "id"))
+////        icon = ImageView(context)
+//        icon.apply {
+//            setBackgroundResource(ResUtils.getResId(context, "yyxx_float_logo_img", "drawable"))
+//            val params = LayoutParams(iconWidth, iconHeight)
+//            layoutParams = params
+//            setOnClickListener(this@FloatCenter)
+//        }
+//        removeAllViews()
+//        addView(leftView)
+//        addView(rightView)
+        view.addView(icon)
+        addView(view)
+
+//        setDragViewLayoutListener(object :DragViewLayoutListener {
+//
+//        })
+//        setDragViewLayoutListener(object :Drag)
+    }
+
+    override fun updateFloatPosition(p0: Boolean) {
+        super.updateFloatPosition(p0)
+//        if (!isDrag) {
+//            Logger.d("updateFloatPosition isRight : $isRightFloat")
+//            if (isRightFloat) {
+//                val params = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+//                params.marginEnd = DensityUtils.dip2px(activity, 65f)
+//                icon.layoutParams = params
+//                rightMenu.visibility = View.VISIBLE
+//            }
+//        }
+    }
+
+    override fun startAnim() {
+        super.startAnim()
+//        Logger.d("startAnim mWidth $mWidth")
+//        mWidth = iconWidth
+//        if (isShowMenu) {
+//            icon.apply {
+//                val params = LayoutParams(iconWidth, iconHeight)
+//                layoutParams = params
+//            }
+//            leftMenu.visibility = View.GONE
+//            leftMenu.visibility = View.GONE
+//            updateFloatPosition(false)
+//            isShowMenu = false
+//        }
+    }
+
+
+    override fun onClick(v: View?) {
+        v?.apply {
+            Logger.d("FloatCenter onClick , isRight : $isRightFloat")
+            if (isDrag) {
+                return
+            }
+//            mWidth = iconWidth
+//            icon.apply {
+//                val params = LayoutParams(iconWidth, iconHeight)
+//                layoutParams = params
+//            }
+//            updateFloatPosition(false)
+            if (isShowMenu) {
+//                leftMenu.visibility = View.GONE
+//                rightMenu.visibility = View.GONE
+                mWidth = iconWidth
+                view.removeAllViews()
+                view.addView(icon)
+                updateViewLayout(view, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT))
+                isShowMenu = false
+                updateFloatPosition(false)
+                return
+            }
+            if (isRightFloat) {
+//                leftMenu.visibility = View.GONE
+//                rightMenu.visibility = View.VISIBLE
+//                val rootParam = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+                mWidth = iconWidth
+                view.removeAllViews()
+                removeAllViews()
+                view.addView(menu)
+                view.addView(icon)
+                addView(view)
+                updateViewLayout(view, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT))
+                isShowMenu = true
+                updateFloatPosition(false)
+            } else {
+                mWidth = menuWidth
+                view.removeAllViews()
+                removeAllViews()
+                view.addView(icon)
+                view.addView(menu)
+                addView(view)
+                updateViewLayout(view, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT))
+//                val params = LayoutParams(iconWidth, iconWidth)
+//                icon.layoutParams = params
+//                val menuParams = LayoutParams(menuWidth, menuHeight)
+//                leftMenu.layoutParams = menuParams
+//                leftMenu.visibility = View.VISIBLE
+//                rightMenu.visibility = View.GONE
+//                val rootParam = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
+                isShowMenu = true
+                updateFloatPosition(false)
+            }
+        }
+    }
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floating/FloatCenterItem.kt

@@ -0,0 +1,83 @@
+package cn.yyxx.eyuangame.core.impl.floating
+
+import android.content.Context
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import cn.yyxx.eyuangame.core.entity.FloatFeature
+import cn.yyxx.support.ResUtils
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/28
+ */
+class FloatCenterItem constructor(context: Context, url: String, feature: FloatFeature) : LinearLayout(context) {
+
+    private lateinit var root: View
+    private lateinit var icon: ImageView
+    private lateinit var desc: TextView
+
+    init {
+        initView(context, url, feature)
+    }
+
+    private fun initView(context: Context, url: String, feature: FloatFeature) {
+        root = LayoutInflater.from(context).inflate(ResUtils.getResId(context, "yyxx_float_item", "layout"), null)
+        icon = root.findViewById(ResUtils.getResId(context, "yyxx_iv_float_icon", "id"))
+        desc = root.findViewById(ResUtils.getResId(context, "yyxx_tv_float_desc", "id"))
+
+
+        when (feature) {
+            FloatFeature.FEATURE_MEMBER -> {
+                if (TextUtils.isEmpty(url)) {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_member_img", "drawable"))
+                } else {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_member_img", "drawable"))
+                }
+                desc.text = ResUtils.getResString(context, "yyxx_tv_float_member_desc")
+            }
+
+            FloatFeature.FEATURE_GIF -> {
+                if (TextUtils.isEmpty(url)) {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_gif_img", "drawable"))
+                } else {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_gif_img", "drawable"))
+                }
+                desc.text = ResUtils.getResString(context, "yyxx_tv_float_gif_desc")
+            }
+
+            FloatFeature.FEATURE_GM -> {
+                if (TextUtils.isEmpty(url)) {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_gm_img", "drawable"))
+                } else {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_gm_img", "drawable"))
+                }
+                desc.text = ResUtils.getResString(context, "yyxx_tv_float_gm_desc")
+            }
+
+            FloatFeature.FEATURE_CHARGE -> {
+                if (TextUtils.isEmpty(url)) {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_charge_img", "drawable"))
+                } else {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_charge_img", "drawable"))
+                }
+                desc.text = ResUtils.getResString(context, "yyxx_tv_float_charge_desc")
+            }
+
+            FloatFeature.FEATURE_INVITE -> {
+                if (TextUtils.isEmpty(url)) {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_invite_img", "drawable"))
+                } else {
+                    icon.setBackgroundResource(ResUtils.getResId(context, "yyxx_float_invite_img", "drawable"))
+                }
+                desc.text = ResUtils.getResString(context, "yyxx_tv_float_invite_desc")
+            }
+        }
+
+        addView(root)
+//        icon = view
+    }
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floating/FloatCenterService.kt

@@ -0,0 +1,118 @@
+package cn.yyxx.eyuangame.core.impl.floating
+
+import android.app.Activity
+import android.app.Service
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.Binder
+import android.os.IBinder
+import cn.yyxx.eyuangame.core.entity.FloatFeature
+import cn.yyxx.support.ResUtils
+import cn.yyxx.support.ui.floating.FloatItem
+import cn.yyxx.support.ui.floating.FloatLogoMenu
+import cn.yyxx.support.ui.floating.FloatMenuView
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/28
+ */
+class FloatCenterService : Service() {
+
+        private var floatCenter: FloatLogoMenu? = null
+//    private var floatCenter: FloatCenter? = null
+    private var mActivity: Activity? = null
+
+    override fun onCreate() {
+        super.onCreate()
+    }
+
+    fun initService(activity: Activity) {
+        this.mActivity = activity
+    }
+
+    fun show() {
+        if (floatCenter == null && mActivity != null) {
+//            val features = mutableListOf(
+//                FloatCenterItem(mActivity!!, "", FloatFeature.FEATURE_MEMBER),
+//                FloatCenterItem(mActivity!!, "", FloatFeature.FEATURE_GIF),
+//                FloatCenterItem(mActivity!!, "", FloatFeature.FEATURE_GM),
+//                FloatCenterItem(mActivity!!, "", FloatFeature.FEATURE_CHARGE),
+//                FloatCenterItem(mActivity!!, "", FloatFeature.FEATURE_INVITE),
+//            )
+            val features = mutableListOf(
+                FloatItem(
+                    ResUtils.getResString(mActivity, "yyxx_tv_float_member_desc"),
+                    "#1DB1AD",
+                    "#000000",
+                    BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_member_img", "drawable"))
+                ),
+                FloatItem(
+                    ResUtils.getResString(mActivity, "yyxx_tv_float_gif_desc"),
+                    "#1DB1AD",
+                    "#000000",
+                    BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_gif_img", "drawable"))
+                ),
+                FloatItem(
+                    ResUtils.getResString(mActivity, "yyxx_tv_float_gm_desc"),
+                    "#1DB1AD",
+                    "#000000",
+                    BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_gm_img", "drawable"))
+                ),
+                FloatItem(
+                    ResUtils.getResString(mActivity, "yyxx_tv_float_charge_desc"),
+                    "#1DB1AD",
+                    "#000000",
+                    BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_charge_img", "drawable"))
+                ),
+                FloatItem(
+                    ResUtils.getResString(mActivity, "yyxx_tv_float_invite_desc"),
+                    "#1DB1AD",
+                    "#000000",
+                    BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_invite_img", "drawable"))
+                ),
+            )
+
+            floatCenter = FloatLogoMenu.Builder()
+                .withActivity(mActivity)
+                .logo(BitmapFactory.decodeResource(mActivity!!.resources, ResUtils.getResId(mActivity, "yyxx_float_logo_img", "drawable")))
+                .drawCicleMenuBg(true)
+                .backMenuColor("#FFFFFF")
+                .setBgDrawable(mActivity!!.resources.getDrawable(ResUtils.getResId(mActivity, "yyxx_float_menu_bg", "drawable")))
+                //这个背景色需要和logo的背景色一致
+                .setFloatItems(features)
+                .defaultLocation(FloatLogoMenu.LEFT)
+                .drawRedPointNum(false)
+                .showWithListener(object : FloatMenuView.OnMenuClickListener {
+                    override fun onItemClick(p0: Int, p1: String?) {
+                    }
+
+                    override fun dismiss() {
+                    }
+
+                })
+//            floatCenter = FloatCenter(mActivity!!, features)
+        }
+        floatCenter?.show()
+    }
+
+    fun hide() {
+        floatCenter?.hide()
+    }
+
+    fun release() {
+        floatCenter?.release()
+    }
+
+    override fun onBind(intent: Intent?): IBinder {
+        return FloatCenterServiceBinder()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return super.onStartCommand(intent, flags, startId)
+    }
+
+    inner class FloatCenterServiceBinder : Binder() {
+        val service: FloatCenterService = this@FloatCenterService
+    }
+
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floating/FloatCenterServiceManager.kt

@@ -0,0 +1,79 @@
+package cn.yyxx.eyuangame.core.impl.floating
+
+import android.app.Activity
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.text.TextUtils
+import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/28
+ */
+class FloatCenterServiceManager private constructor() {
+
+    private var mService: FloatCenterService? = null
+    private var mActivity: Activity? = null
+    private var mIntent: Intent? = null
+    private var isBindService = false
+
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+            mService = (service as FloatCenterService.FloatCenterServiceBinder).service
+            mService?.initService(mActivity!!)
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+        }
+
+    }
+
+    fun init(activity: Activity) {
+        this.mActivity = activity
+        if (mService == null) {
+            mIntent = Intent(activity.applicationContext, FloatCenterService::class.java)
+            activity.applicationContext.startService(mIntent)
+            activity.applicationContext.bindService(mIntent, serviceConnection, Context.BIND_AUTO_CREATE)
+            isBindService = true
+        }
+    }
+
+    fun show() {
+        if (mService == null) {
+            Logger.e("浮标服务未初始化或发生异常")
+            return
+        }
+        if (!TextUtils.isEmpty(SdkBackLoginInfo.instance.userId)) {
+            mService?.show()
+        } else {
+            hide()
+        }
+    }
+
+    fun hide() {
+        mService?.hide()
+    }
+
+    fun release() {
+        mService?.apply {
+            release()
+            if (isBindService) {
+                mActivity?.applicationContext?.unbindService(serviceConnection)
+                mActivity?.applicationContext?.stopService(mIntent)
+            }
+        }
+        mIntent = null
+        mActivity = null
+    }
+
+
+    companion object {
+        val instance: FloatCenterServiceManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            FloatCenterServiceManager()
+        }
+    }
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/ChargeImpl.kt

@@ -0,0 +1,263 @@
+package cn.yyxx.eyuangame.core.impl.iab
+
+import android.app.Activity
+import android.text.TextUtils
+import cn.yyxx.eyuangame.base.entity.SdkChargeInfo
+import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.eyuangame.core.entity.ResultInfo
+import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
+import cn.yyxx.eyuangame.core.internal.IImplCallback
+import cn.yyxx.eyuangame.core.internal.IRequestCallback
+import cn.yyxx.eyuangame.core.network.SdkRequest
+import cn.yyxx.support.JsonUtils
+import cn.yyxx.support.hawkeye.ToastUtils
+import com.android.billingclient.api.*
+import org.json.JSONException
+import org.json.JSONObject
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/28
+ */
+class ChargeImpl : InAppBilling() {
+
+    //初始化IAB收银台客户端
+    //连接谷歌商店
+//    private var payLoadingDialog: CircleProgressLoadingDialog? = null
+    private lateinit var implCallback: IImplCallback
+    private lateinit var chargeInfo: SdkChargeInfo
+
+
+    fun charge(activity: Activity, chargeInfo: SdkChargeInfo, callback: IImplCallback) {
+        if (!checkGoogleApiAvailability(activity)) {
+            ToastUtils.toastInfo(activity, "Your phone or Google account does not support In-app Billing")
+            callback.onResult(-1, "谷歌iab支付服务不可用")
+            return
+        }
+        this.implCallback = callback
+        this.chargeInfo = chargeInfo
+        //dismissDialog()
+        //showDialog()
+
+        checkLocalNotifyFailedOrder(activity)
+        getOrderId(activity)
+
+    }
+
+    override fun chargePurchasesUpdated(activity: Activity, purchase: Purchase) {
+        notifyOrder2Backend(activity, chargeInfo.orderId, purchase.originalJson, purchase.signature, false)
+    }
+
+    override fun preRewardPurchasesUpdated(activity: Activity, purchase: Purchase) {
+    }
+
+    override fun queryRewardInfo(activity: Activity) {
+    }
+
+    /**
+     * 查询未消耗订单
+     */
+    override fun queryChargeInfo(activity: Activity) {
+        billingClient?.apply {
+            queryPurchasesAsync(BillingClient.SkuType.INAPP, object : PurchasesResponseListener {
+                override fun onQueryPurchasesResponse(billingResult: BillingResult, list: MutableList<Purchase>) {
+                    if (list.isNullOrEmpty()) {
+                        //正常发起支付流程
+                        Logger.d("正常发起支付流程")
+                        querySkuDetails(activity)
+                    } else {
+                        Logger.e("存在未消耗订单，发起补单流程，size : ${list.size}")
+                        run breaking@{
+                            list.forEach { purchase ->
+                                Logger.d(purchase.toString())
+                                purchase.skus.forEach {
+                                    if (it.equals(SdkBridgeImpl.initBean.rewardId)) {
+                                        Logger.e("存在阻塞的预注册奖励，停止支付流程")
+                                        if (list.size == 1) {
+                                            ToastUtils.toastInfo(activity, "In-app Billing has some error , please restart app and try again")
+                                            dismissDialog()
+                                            disConnection()
+                                            implCallback.onResult(-1, "存在阻塞的预注册奖励，停止支付流程")
+                                        }
+                                        //跳出支付流程
+                                        return@breaking
+                                    } else {
+                                        consumeCacheOrder(activity, purchase)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+            })
+        }
+    }
+
+    override fun purchasesUpdatedFailed() {
+        TODO("Not yet implemented")
+    }
+
+    override fun connectGooglePlayFailed() {
+        TODO("Not yet implemented")
+    }
+
+    /**
+     * 检查本地通知发货失败订单
+     */
+    private fun checkLocalNotifyFailedOrder(activity: Activity) {
+
+    }
+
+    /**
+     * 获取订单号
+     */
+    private fun getOrderId(activity: Activity) {
+        SdkRequest.instance.createOrder(activity, chargeInfo, object : IRequestCallback {
+            override fun onResponse(resultInfo: ResultInfo) {
+                if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
+                    try {
+                        val jsonObject = JSONObject(resultInfo.data)
+                        chargeInfo.orderId = jsonObject.getString("order_id")
+                        Logger.d("order_id ---> ${chargeInfo.orderId}")
+                        //获取订单号成功，初始化IAB收银台客户端
+                        Logger.d("获取订单号成功，初始化IAB收银台客户端")
+                        initializeBillingClient(activity)
+                        connectGooglePlay(activity, false)
+                    } catch (e: JSONException) {
+                        e.printStackTrace()
+                        //dismissDialog()
+                        implCallback.onResult(-1, "获取订单异常")
+                    }
+                }
+            }
+
+        })
+    }
+
+    /**
+     * 查询商品信息
+     */
+    private fun querySkuDetails(activity: Activity) {
+        val skus = mutableListOf<String>()
+        skus.add(chargeInfo.productId)
+        val params = SkuDetailsParams.newBuilder().setType(BillingClient.SkuType.INAPP).setSkusList(skus).build()
+        billingClient?.querySkuDetailsAsync(params, object : SkuDetailsResponseListener {
+            override fun onSkuDetailsResponse(billingResult: BillingResult, list: MutableList<SkuDetails>?) {
+                dismissDialog()
+                if (list.isNullOrEmpty()) {
+                    //查询商品信息失败
+                    Logger.e("查询商品信息失败")
+                    implCallback.onResult(-1, "查询商品信息失败")
+                    disConnection()
+                } else {
+                    if (list.size == 1) {
+                        val skuDetails = list[0]
+                        Logger.d("product id : ${skuDetails.sku}")
+                        launchBillingFlow(activity, skuDetails)
+                    } else {
+                        implCallback.onResult(-1, "查询商品信息异常")
+                        disConnection()
+                    }
+                }
+            }
+        })
+    }
+
+    /**
+     * 启动收银台
+     *
+     */
+    private fun launchBillingFlow(activity: Activity, skuDetails: SkuDetails) {
+        billingClient?.apply {
+            if (isReady) {
+                val flowParams = BillingFlowParams.newBuilder().setObfuscatedAccountId(chargeInfo.orderId).setSkuDetails(skuDetails).build()
+                val billingResult = launchBillingFlow(activity, flowParams)
+                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
+                    dismissDialog()
+                    disConnection()
+                    implCallback.onResult(-1, "启动谷歌收银台失败")
+                }
+            } else {
+                dismissDialog()
+                disConnection()
+                implCallback.onResult(-1, "启动谷歌收银台失败")
+            }
+        }
+    }
+
+    /**
+     * 通知服务端发货
+     */
+    private fun notifyOrder2Backend(activity: Activity, orderId: String, originalJson: String, signature: String, isCache: Boolean = false) {
+        if (!isCache) {
+            // saveOrder2Local()
+        }
+        SdkRequest.instance.notifyOrder(activity, orderId, originalJson, signature, object : IRequestCallback {
+            override fun onResponse(resultInfo: ResultInfo) {
+                try {
+                    //消耗订单
+                    val jsonObject = JSONObject(originalJson)
+                    if (JsonUtils.hasJsonKey(jsonObject, "purchaseToken")) {
+                        consumeAsync(activity, jsonObject.getString("purchaseToken"), isCache)
+                    }
+                } catch (e: JSONException) {
+                    e.printStackTrace()
+                    dismissDialog()
+                    disConnection()
+                }
+            }
+        })
+    }
+
+    /**
+     * 消耗缓存订单
+     */
+    private fun consumeCacheOrder(activity: Activity, purchase: Purchase) {
+        //消耗完了再发起支付
+        val cache = ""
+        val orerId = ""
+        val originalJson = purchase.originalJson
+        val purchaseToken = ""
+
+    }
+
+    /**
+     * 消耗订单
+     */
+    private fun consumeAsync(activity: Activity, purchaseToken: String, isCache: Boolean = false) {
+        val consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build()
+        billingClient?.apply {
+            if (isReady) {
+                consumeAsync(consumeParams, object : ConsumeResponseListener {
+                    override fun onConsumeResponse(billingResult: BillingResult, purchaseToken: String) {
+                        dismissDialog()
+                        if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                            // saveOrder2Local()
+                            if (isCache) {
+                                querySkuDetails(activity)
+                            } else {
+                                disConnection()
+                                implCallback.onResult(0, "支付成功")
+                            }
+                        } else {
+                            disConnection()
+                            implCallback.onResult(-1, "消耗订单异常")
+                        }
+                    }
+                })
+            } else {
+                dismissDialog()
+                disConnection()
+                implCallback.onResult(-1, "消耗订单异常")
+            }
+        }
+    }
+
+
+    companion object {
+        val instance: ChargeImpl by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            ChargeImpl()
+        }
+    }
+}

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/InAppBilling.kt

@@ -1,8 +1,8 @@
 package cn.yyxx.eyuangame.core.impl.iab
 
 import android.app.Activity
-import android.content.Context
 import cn.yyxx.eyuangame.base.utils.Logger
+import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingResult
@@ -18,34 +18,43 @@ abstract class InAppBilling {
 
     protected var billingClient: BillingClient? = null
 
-    protected fun checkGoogleApiAvailability(context: Context): Boolean {
-        return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS
-    }
-
-    protected fun initializeBillingClient(context: Context) {
-
+    protected fun checkGoogleApiAvailability(activity: Activity): Boolean {
+        return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(activity) == ConnectionResult.SUCCESS
     }
 
     /**
-     * charge
-     * Purchase{"orderId":"GPA.3325-4558-9050-03633","packageName":"com.flyfun.demo","productId":"com.flyfun.ylj.60","purchaseTime":1618367632652,"purchaseState":4,"purchaseToken":"mpfdmeeoemplddgfknnkgnlf.AO-J1Owpfua8OfxpU_sjOBTY_ZgRoN3Km-mNJdmie9Qpd1w-DDQjtkUfcWOGhScHHeJ9ogWqkP_01w5WHp9Pfnpvgx1_nffDYA","acknowledged":false}
+     * 初始化IAB收银台客户端
      */
-    protected abstract fun chargePurchasesUpdated(activity: Activity, purchase: Purchase)
+    protected fun initializeBillingClient(activity: Activity) {
+        billingClient = BillingClient.newBuilder(activity).setListener { billingResult, list ->
+            //谷歌支付结果在这里回调
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                if (list.isNullOrEmpty()) {
+                    purchasesUpdatedFailed()
+                } else {
+                    for (purchase in list) {
+                        Logger.d(purchase.toString())
+                        purchase.skus.forEach {
+                            if (it.equals(SdkBridgeImpl.initBean.rewardId)) {
+                                //预注册
+                                preRewardPurchasesUpdated(activity, purchase)
+                            } else {
+                                //支付
+                                chargePurchasesUpdated(activity, purchase)
+                            }
+                        }
+                    }
+                }
+            } else {
+                purchasesUpdatedFailed()
+            }
+        }.enablePendingPurchases().build()
+    }
+
 
     /**
-     * pre reward
-     * Purchase{"packageName":"com.flyfun.demo","productId":"com.flyfun.demo70","purchaseTime":1618367980837,"purchaseState":0,"purchaseToken":"cdphbkooagehckdcmkhmbhmd.AO-J1OzHTtCRDhd8k1Qfp3FU0GgYQUSaCx6I6W6Oi_P2tiS3LWKIdb6jTkc-tTqfcCagPxw2nPqujl9s10KuCunTl3OLSiIN9A"}
+     * 连接谷歌商店
      */
-    protected abstract fun preRewardPurchasesUpdated(activity: Activity, purchase: Purchase)
-
-    protected abstract fun queryRewardInfo(activity: Activity)
-
-    protected abstract fun queryChargeInfo(activity: Activity)
-
-    protected abstract fun purchasesUpdatedFailed()
-
-    protected abstract fun connectGooglePlayFailed()
-
     protected fun connectGooglePlay(activity: Activity, isPreReward: Boolean = false) {
         billingClient?.apply {
             if (!isReady) {
@@ -69,10 +78,15 @@ abstract class InAppBilling {
                         connectGooglePlay(activity, isPreReward)
                     }
                 })
+            } else {
+                dismissDialog()
+                disConnection()
             }
         }
     }
 
+//    protected fun handlePurchase(list)
+
     protected fun disConnection() {
         billingClient?.apply {
             if (isReady) {
@@ -87,4 +101,29 @@ abstract class InAppBilling {
         val msg = billingResult.debugMessage
         Logger.d("$callbackFuncName , code : $code , msg : $msg")
     }
+
+    protected fun showDialog() {}
+
+    protected fun dismissDialog() {}
+
+    /**
+     * charge
+     * Purchase{"orderId":"GPA.3325-4558-9050-03633","packageName":"com.flyfun.demo","productId":"com.flyfun.ylj.60","purchaseTime":1618367632652,"purchaseState":4,"purchaseToken":"mpfdmeeoemplddgfknnkgnlf.AO-J1Owpfua8OfxpU_sjOBTY_ZgRoN3Km-mNJdmie9Qpd1w-DDQjtkUfcWOGhScHHeJ9ogWqkP_01w5WHp9Pfnpvgx1_nffDYA","acknowledged":false}
+     */
+    protected abstract fun chargePurchasesUpdated(activity: Activity, purchase: Purchase)
+
+    /**
+     * pre reward
+     * Purchase{"packageName":"com.flyfun.demo","productId":"com.flyfun.demo70","purchaseTime":1618367980837,"purchaseState":0,"purchaseToken":"cdphbkooagehckdcmkhmbhmd.AO-J1OzHTtCRDhd8k1Qfp3FU0GgYQUSaCx6I6W6Oi_P2tiS3LWKIdb6jTkc-tTqfcCagPxw2nPqujl9s10KuCunTl3OLSiIN9A"}
+     */
+    protected abstract fun preRewardPurchasesUpdated(activity: Activity, purchase: Purchase)
+
+    protected abstract fun queryRewardInfo(activity: Activity)
+
+    protected abstract fun queryChargeInfo(activity: Activity)
+
+    protected abstract fun purchasesUpdatedFailed()
+
+    protected abstract fun connectGooglePlayFailed()
+
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/LoginActivity.kt

@@ -87,13 +87,15 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
         super.onCreate(savedInstanceState)
         userSignInImpl = UserSignInImpl(this, object : UserSignInImpl.ISignInCallback {
             override fun onSuccess(result: String) {
+                hideAutoLoginDialog()
                 hideChooseDialog()
-//                userLoginVerify(JSONObject(result))
                 this@LoginActivity.finish()
                 implCallback?.onResult(0, result)
             }
 
             override fun onFailed(result: String) {
+                //TODO 失败情况需要测试
+                hideChooseDialog()
                 implCallback?.onResult(-1, result)
             }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/UserSignInImpl.kt

@@ -150,6 +150,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
     fun userRegister(context: Context, userName: String, pwd: String) {
         try {
             val registerParams = JSONObject()
+            registerParams.put("login_type", LoginType.TYPE_ACCOUNT_LOGIN)
             registerParams.put("uname", userName)
             registerParams.put("pwd", pwd)
             SdkRequest.instance.registerUser(context, registerParams, object : IRequestCallback {
@@ -159,9 +160,9 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                             val jsonObject = JSONObject(resultInfo.data)
                             SdkBackLoginInfo.instance.userId = jsonObject.getString("uid")
                             SdkBackLoginInfo.instance.token = jsonObject.getString("token")
-                            SdkBackLoginInfo.instance.isRegUser = true
-                            SdkBackLoginInfo.instance.hasBindAccount = false
-                            SdkBackLoginInfo.instance.phoneNum = ""
+                            SdkBackLoginInfo.instance.isRegUser = jsonObject.getInt("is_reg_user") == 1
+                            SdkBackLoginInfo.instance.hasBindAccount = jsonObject.getInt("has_bind_account") == 1
+                            SdkBackLoginInfo.instance.phoneNum = jsonObject.getString("phone_num")
                             SdkBackLoginInfo.instance.loginType = LoginType.TYPE_ACCOUNT_LOGIN
 
                             with(Session()) {

library_core/src/main/java/cn/yyxx/eyuangame/core/network/Host.kt

@@ -10,7 +10,7 @@ import cn.yyxx.support.HostModelUtils
 object Host {
 
     private const val DEFAULT_ONLINE_HOST = ""
-    private const val DEFAULT_TEST_HOST = "http://47.103.149.24:81"
+    private const val DEFAULT_TEST_HOST = "http://testsdkapi.eyuangame.com"
 
     var HOST = ""
 
@@ -24,7 +24,7 @@ object Host {
     var BASIC_ROUTE_THIRD_PART_LOGIN = "third_plat_login"
     var BASIC_ROUTE_REGISTER = "member_register"
     var BASIC_ROUTE_FORGET_PWD = ""
-    var BASIC_ROUTE_GET_ORDER_ID = ""
+    var BASIC_ROUTE_CREATE_ORDER = ""
     var BASIC_ROUTE_NOTIFY_ORDER = ""
     var BASIC_ROUTE_NOTIFY_REWARD = ""
     var BASIC_ROUTE_SUBMIT_ROLE_INFO = ""

library_core/src/main/java/cn/yyxx/eyuangame/core/network/SdkRequest.kt

@@ -7,6 +7,7 @@ import cn.yyxx.eyuangame.base.entity.SdkChargeInfo
 import cn.yyxx.eyuangame.base.entity.SdkRoleInfo
 import cn.yyxx.eyuangame.base.utils.ParamsUtils
 import cn.yyxx.eyuangame.core.entity.LoginType
+import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.internal.IRequestCallback
 import cn.yyxx.support.AppUtils
 import cn.yyxx.support.DensityUtils
@@ -23,20 +24,22 @@ class SdkRequest {
 
     fun initSdk(context: Context, callback: IRequestCallback) {
         val jsonObject = JSONObject()
-//        jsonObject.put("common", getCommon(context))
-        jsonObject.put("route_path", Host.BASIC_ROUTE_INIT_SDK)
+        try {
+            jsonObject.put("route_path", Host.BASIC_ROUTE_INIT_SDK)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
     }
 
     fun userLoginVerify(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
         try {
-            jsonObject.put("common", getCommon(context))
             if (jsonObject.getInt("login_type") == LoginType.TYPE_ACCOUNT_LOGIN) {
                 jsonObject.put("route_path", Host.BASIC_ROUTE_LOGIN)
             } else {
                 jsonObject.put("route_path", Host.BASIC_ROUTE_THIRD_PART_LOGIN)
             }
-        } catch (e: Exception) {
+        } catch (e: JSONException) {
             e.printStackTrace()
         }
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
@@ -44,9 +47,8 @@ class SdkRequest {
 
     fun registerUser(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
         try {
-            jsonObject.put("common", getCommon(context))
             jsonObject.put("route_path", Host.BASIC_ROUTE_REGISTER)
-        } catch (e: Exception) {
+        } catch (e: JSONException) {
             e.printStackTrace()
         }
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
@@ -69,6 +71,30 @@ class SdkRequest {
     }
 
     fun createOrder(context: Context, chargeInfo: SdkChargeInfo, callback: IRequestCallback) {
+        val jsonObject = JSONObject()
+        try {
+            jsonObject.put("login_type", SdkBackLoginInfo.instance.loginType)
+            jsonObject.put("uid", chargeInfo.userId)
+            jsonObject.put("role_id", chargeInfo.roleId)
+            jsonObject.put("role_name", chargeInfo.roleName)
+            jsonObject.put("role_level", chargeInfo.roleLevel)
+            jsonObject.put("server_id", chargeInfo.serverId)
+            jsonObject.put("server_name", chargeInfo.serverName)
+            jsonObject.put("amount", chargeInfo.amount)
+            jsonObject.put("product_id", chargeInfo.productId)
+            jsonObject.put("product_name", chargeInfo.productName)
+            jsonObject.put("product_desc", chargeInfo.productDesc)
+            jsonObject.put("cp_order_id", chargeInfo.cpOrderId)
+            jsonObject.put("cp_callback_info", chargeInfo.cpCallbackInfo)
+            jsonObject.put("route_path", Host.BASIC_ROUTE_CREATE_ORDER)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
+    }
+
+
+    fun notifyOrder(context: Context, orderId: String, originalJson: String, signature: String, callback: IRequestCallback) {
 
     }
 

library_core/src/main/res/drawable/yyxx_float_menu_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="85dp" />
+    <solid android:color="@color/yyxx_color_white" />
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/yyxx_color_green_blue" />
+</shape>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/yyxx_iv_float_icon"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:background="@drawable/yyxx_float_logo_img" />
+
+    <TextView
+        android:id="@+id/yyxx_tv_float_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="feature"
+        android:textColor="@color/yyxx_color_green_blue"
+        android:textSize="10sp" />
+
+</LinearLayout>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@drawable/yyxx_float_menu_bg">
+
+
+    <ImageView
+        android:id="@+id/yyxx_iv_icon"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:background="@drawable/yyxx_float_logo_img" />
+
+
+
+    <LinearLayout
+        android:id="@+id/yyxx_left_menu"
+        android:layout_width="100dp"
+        android:layout_height="35dp"
+        android:background="@drawable/yyxx_float_menu_bg"
+        android:orientation="horizontal"
+        android:visibility="visible" />
+
+<!--    <LinearLayout-->
+<!--        android:id="@+id/yyxx_right_menu"-->
+<!--        android:layout_width="100dp"-->
+<!--        android:layout_height="35dp"-->
+<!--        android:background="@drawable/yyxx_float_menu_bg"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:visibility="visible" />-->
+
+
+</LinearLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+
+    <LinearLayout
+        android:id="@+id/yyxx_right_menu"
+        android:layout_width="100dp"
+        android:layout_height="35dp"
+        android:background="@drawable/yyxx_float_menu_bg"
+        android:orientation="horizontal"
+        android:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/yyxx_iv_icon"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginStart="65dp"
+        android:background="@drawable/yyxx_float_logo_img" />
+
+</FrameLayout>

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

@@ -28,6 +28,12 @@
     <string name="yyxx_tv_exit_left">下次再見</string>
     <string name="yyxx_tv_exit_right">再玩一下</string>
 
+    <string name="yyxx_tv_float_member_desc">會員</string>
+    <string name="yyxx_tv_float_gif_desc">禮包</string>
+    <string name="yyxx_tv_float_gm_desc">客服</string>
+    <string name="yyxx_tv_float_charge_desc">儲值</string>
+    <string name="yyxx_tv_float_invite_desc">邀請好友</string>
+
 
     <string name="yyxx_title_forget">忘記密碼</string>
     <string name="yyxx_title_agreement">會員條款及管理規章</string>