From 0843579a8122b81300a8a22d49f30e73a24eb52d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 21 十一月 2023 17:43:24 +0800
Subject: [PATCH] 0312 咪噜新sdk
---
SdkProject/channel/mlgtgame/res/layout-port/ml_fragment_select_login.xml | 0
SdkProject/channel/mlgtgame/res/values/strings.xml | 6
/dev/null | 0
Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar | 0
SdkProject/channel/mlgtgame/java/com/secondworld/sdk/GTGameMain.java | 1
SdkProject/channel/mlgtgame/libs/hhxksdk1.0.6.jar | 0
SdkProject/channel/mlgtgame/res/values-zh-rTW/strings.xml | 6
SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java | 4
Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar | 0
SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformPay.java | 4
SdkProject/channel/mlgtgame/res/layout/ml_item_service.xml | 15 ++
SdkProject/channel/mlgtgame/res/layout-land/ml_fragment_select_login.xml | 244 ++++++++++++++++++++++++++++++++++++++++++++++++
12 files changed, 267 insertions(+), 13 deletions(-)
diff --git a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
index bbb271e..0a9bb60 100644
--- a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
Binary files differ
diff --git a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
index b66e364..aa767cd 100644
--- a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
Binary files differ
diff --git a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/GTGameMain.java b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/GTGameMain.java
index c88a718..2001edf 100644
--- a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/GTGameMain.java
+++ b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/GTGameMain.java
@@ -1,7 +1,6 @@
package com.secondworld.sdk;
import android.app.Activity;
-
import androidx.annotation.NonNull;
public class GTGameMain extends GameActivityProxy {
diff --git a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
index f8d9955..38a20fb 100644
--- a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/MySdkMgr.java
@@ -119,8 +119,8 @@
}
- public void pay(String roleID, String money, String serverID, String productName, String productDesc, String Extra) {
- miluSDKManager.showPay(GTGameMain.I.activity, roleID, money, serverID, productName, productDesc, Extra,
+ public void pay(String roleID, String money, String serverID, String productID, String productName, String Extra) {
+ miluSDKManager.showPay(GTGameMain.I.activity, money, productID, roleID, productName, productName, serverID, Extra,
new OnPaymentListener() {
@Override
public void paymentSuccess(PaymentCallbackInfo callbackInfo) {
diff --git a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformPay.java
index 2506dcf..7e777e6 100644
--- a/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/mlgtgame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -21,8 +21,8 @@
extraData.put("serverid", json.getString("sid"));
extraData.put("channelID", "9998");
- MySdkMgr.I.pay(json.getString("roleID"), json.getString("money"),
- json.getString("sid"), json.getString("cpinfo"),
+ MySdkMgr.I.pay(json.getString("roleID"), json.getString("mount"),
+ json.getString("sid"), json.getString("cpInfo"),
json.getString("title"), extraData.toString());
}
}
diff --git a/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.3.jar b/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.3.jar
deleted file mode 100644
index ef10ff2..0000000
--- a/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.6.jar b/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.6.jar
new file mode 100644
index 0000000..2821696
--- /dev/null
+++ b/SdkProject/channel/mlgtgame/libs/hhxksdk1.0.6.jar
Binary files differ
diff --git a/SdkProject/channel/mlgtgame/res/layout-land/ml_fragment_select_login.xml b/SdkProject/channel/mlgtgame/res/layout-land/ml_fragment_select_login.xml
new file mode 100644
index 0000000..5b05b66
--- /dev/null
+++ b/SdkProject/channel/mlgtgame/res/layout-land/ml_fragment_select_login.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:ignore="MissingDefaultResource">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/tv_versionName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="15dp"
+ android:layout_marginTop="15dp"
+ android:textColor="#ff999999"
+ android:textSize="10sp" />
+
+ <LinearLayout
+ android:id="@+id/ll_service"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="5dp"
+ android:src="@mipmap/ml_ic_login_service_red" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="30dp"
+ android:text="@string/ml_login_kefu_title"
+ android:textColor="@color/milu_orange"
+ android:textSize="10sp" />
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <androidx.core.widget.NestedScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:scrollbars="none">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="58dp"
+ android:layout_marginTop="15dp"
+ android:layout_marginRight="58dp"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/iv_logo"
+ android:layout_width="96dp"
+ android:layout_height="47dp"
+ android:layout_gravity="center_horizontal" />
+
+ <TextView
+ android:id="@+id/tv_user_login"
+ android:layout_width="match_parent"
+ android:layout_height="39dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/ml_btn_login_red"
+ android:gravity="center"
+ android:text="@string/ml_select_login_name"
+ android:textColor="@color/ml_white"
+ android:textSize="14dp" />
+
+ <TextView
+ android:id="@+id/tv_visitor_login"
+ android:layout_width="match_parent"
+ android:layout_height="39dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="15dp"
+ android:background="@drawable/botton_yuan_xian_9f9"
+ android:gravity="center"
+ android:text="@string/ml_select_login_visitor"
+ android:textColor="@color/milu_red"
+ android:textSize="14dp" />
+
+ <LinearLayout
+ android:id="@+id/ll_loginWays"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_weight="1"
+ android:alpha="0.5"
+ android:background="@color/ml_color_72" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="15dp"
+ android:layout_marginRight="15dp"
+ android:text="@string/ml_select_login_title"
+ android:textColor="@color/milu_color_99"
+ android:textSize="12dp" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_weight="1"
+ android:alpha="0.5"
+ android:background="@color/ml_color_72" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/tv_google"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_weight="1"
+ android:drawableTop="@mipmap/ml_google"
+ android:drawablePadding="8dp"
+ android:gravity="center"
+ android:text="@string/ml_select_login_google"
+ android:textColor="@color/milu_color_99"
+ android:textSize="13dp"
+ android:visibility="gone" />
+
+ <RelativeLayout
+ android:id="@+id/rl_facebook"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:visibility="gone">
+
+ <com.facebook.login.widget.LoginButton
+ android:id="@+id/btn_facebook"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/tv_facebook"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:drawableTop="@mipmap/ml_facrbook"
+ android:drawablePadding="8dp"
+ android:gravity="center"
+ android:text="@string/ml_select_login_facebook"
+ android:textColor="@color/milu_color_99"
+ android:textSize="13dp" />
+ </RelativeLayout>
+
+
+ </LinearLayout>
+ </LinearLayout>
+
+
+ </LinearLayout>
+
+ </androidx.core.widget.NestedScrollView>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:layout_marginBottom="15dp"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/img_cb"
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:background="@mipmap/hw_account_xz" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginLeft="3dp"
+ android:text="@string/ml_select_login_agree"
+ android:textColor="#ffffffff"
+ android:textSize="10sp" />
+
+ <TextView
+ android:id="@+id/tv_userAgreement"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:autoLink="all"
+ android:text="@string/ml_select_login_agree_01"
+ android:textColor="@color/milu_orange"
+ android:textSize="10sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/ml_select_login_agree_02"
+ android:textColor="#ffffffff"
+ android:textSize="10sp" />
+
+ <TextView
+ android:id="@+id/tv_privacyPolicy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/ml_select_login_agree_03"
+ android:textColor="@color/milu_orange"
+ android:textSize="10sp" />
+
+ </LinearLayout>
+
+
+</LinearLayout>
diff --git a/SdkProject/channel/mlgtgame/res/layout/ml_fragment_select_login.xml b/SdkProject/channel/mlgtgame/res/layout-port/ml_fragment_select_login.xml
similarity index 100%
rename from SdkProject/channel/mlgtgame/res/layout/ml_fragment_select_login.xml
rename to SdkProject/channel/mlgtgame/res/layout-port/ml_fragment_select_login.xml
diff --git a/SdkProject/channel/mlgtgame/res/layout/ml_item_service.xml b/SdkProject/channel/mlgtgame/res/layout/ml_item_service.xml
index 16eead1..0a3f329 100644
--- a/SdkProject/channel/mlgtgame/res/layout/ml_item_service.xml
+++ b/SdkProject/channel/mlgtgame/res/layout/ml_item_service.xml
@@ -20,11 +20,22 @@
android:textColor="@color/ml_white"
android:textSize="13sp" />
- <ImageView
+ <TextView
+ android:id="@+id/tv_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/iv_mlyou"
+ android:textColor="@color/milu_whitecolor"
+ android:textSize="13sp" />
+
+ <ImageView
+ android:id="@+id/iv_mlyou"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginLeft="5dp"
android:src="@mipmap/ml_ic_right_white" />
<View
diff --git a/SdkProject/channel/mlgtgame/res/values-zh-rTW/strings.xml b/SdkProject/channel/mlgtgame/res/values-zh-rTW/strings.xml
index 0779a82..16d0cff 100644
--- a/SdkProject/channel/mlgtgame/res/values-zh-rTW/strings.xml
+++ b/SdkProject/channel/mlgtgame/res/values-zh-rTW/strings.xml
@@ -2,9 +2,9 @@
<string name="app_name">HhxkSdk</string>
<string name="server_client_id">966789831936-h1aps8f3s0v6rgbdu4lt2h74933m7661.apps.googleusercontent.com</string>
- <string name="facebook_app_id" translatable="false">316850860963162</string>
- <string name="fb_login_protocol_scheme" translatable="false">fb316850860963162</string>
- <string name="facebook_client_token">42d8ba217a07ed5dfc5c95f98a9aae30</string>
+ <string name="facebook_app_id" translatable="false">1492763808212075</string>
+ <string name="fb_login_protocol_scheme" translatable="false">fb1492763808212075</string>
+ <string name="facebook_client_token">e26a0c67fc250a478cfb66ce9ccb3f84</string>
<string name="adjust_app_token">ces8o9qnj0n4</string>
<!--鍒濆鍖�-->
diff --git a/SdkProject/channel/mlgtgame/res/values/strings.xml b/SdkProject/channel/mlgtgame/res/values/strings.xml
index ecf2a4a..aa330bd 100644
--- a/SdkProject/channel/mlgtgame/res/values/strings.xml
+++ b/SdkProject/channel/mlgtgame/res/values/strings.xml
@@ -2,9 +2,9 @@
<string name="app_name">HhxkSdk</string>
<string name="server_client_id">966789831936-h1aps8f3s0v6rgbdu4lt2h74933m7661.apps.googleusercontent.com</string>
- <string name="facebook_app_id" translatable="false">316850860963162</string>
- <string name="fb_login_protocol_scheme" translatable="false">fb316850860963162</string>
- <string name="facebook_client_token">42d8ba217a07ed5dfc5c95f98a9aae30</string>
+ <string name="facebook_app_id" translatable="false">1492763808212075</string>
+ <string name="fb_login_protocol_scheme" translatable="false">fb1492763808212075</string>
+ <string name="facebook_client_token">e26a0c67fc250a478cfb66ce9ccb3f84</string>
<string name="adjust_app_token">ces8o9qnj0n4</string>
<!--鍒濆鍖�-->
--
Gitblit v1.8.0