From 14a766de7ddaf2c5e6e0fc0e1d2040fe24bfa72f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 09 一月 2019 14:26:03 +0800
Subject: [PATCH] update 极速sdk相关修改提交
---
Project/js_sdk/build.gradle | 3
/dev/null | 0
Project/js_sdk/libs/lingleisdk-3.0.1.jar | 0
Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml | 34 ++++++++
Project/js_sdk/proguard-rules.pro | 6 +
Project/js_sdk/src/game_jisugame/res/layout/llsdk_demo_activity_main.xml | 116 +++++++++++++++++++++++++++++
Project/js_sdk/src/game_jisugame/res/xml/llsdk_filepaths.xml | 4 +
Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 6 +
Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml | 4 +
Project/js_sdk/src/game_jisugame/AndroidManifest.xml | 27 ++++++
ChannelDiff/Android/jisugame/AndroidManifest.xml | 28 ++++++
ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar | 0
12 files changed, 225 insertions(+), 3 deletions(-)
diff --git a/ChannelDiff/Android/jisugame/AndroidManifest.xml b/ChannelDiff/Android/jisugame/AndroidManifest.xml
index 2f03a7f..5f32a38 100644
--- a/ChannelDiff/Android/jisugame/AndroidManifest.xml
+++ b/ChannelDiff/Android/jisugame/AndroidManifest.xml
@@ -27,11 +27,18 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+
+ <!-- 涓嬮潰鏂板鏉冮檺 -->
+ <!-- 8.0 -->
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+ 鈥�
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.READ_LOGS" />
- <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<permission android:name="com.lingleigame.shaonianqixiachuan.permission.JPUSH_MESSAGE" />
@@ -85,6 +92,25 @@
android:name="com.linglei.sdklib.open.LLService"
android:exported="false" />
+ <!-- Required FileProvider {鎮ㄧ殑鍖呭悕璇蜂慨鏀逛负褰撳墠鍖呭悕} -->
+ <provider
+ android:name="com.linglei.sdklib.open.LLFileProvider"
+ android:authorities="{appId}.llsdk_fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.LLSDK.FILE_PROVIDER_PATHS"
+ android:resource="@xml/llsdk_filepaths" />
+ </provider>
+
+ <!-- Required -->
+ <activity
+ android:name="com.linglei.sdklib.permission.PermissionActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:launchMode="standard"
+ android:theme="@style/LLPermission.Theme.Activity"
+ android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+
<meta-data
android:name="android.max_aspect"
android:value="1075838976.000000" />
diff --git a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
index 9078483..07e5677 100644
--- a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
+++ b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
Binary files differ
diff --git a/Project/js_sdk/build.gradle b/Project/js_sdk/build.gradle
index 1cfc15d..022ccdf 100644
--- a/Project/js_sdk/build.gradle
+++ b/Project/js_sdk/build.gradle
@@ -36,7 +36,6 @@
}
dependencies {
- implementation files('libs/android-support-v4.jar')
implementation files('libs/jcore-android-1.2.1.jar')
implementation files('libs/jpush-android-3.1.3.jar')
implementation files('libs/gson.jar')
@@ -45,7 +44,7 @@
compileOnly files('libs/unity-classes.jar')
implementation files('libs/bugly.jar')
implementation files('libs/buglyagent.jar')
- implementation files('libs/lingleisdk-2.1.0.jar')
+ implementation files('libs/lingleisdk-3.0.1.jar')
}
task autoCopy_jisugame_Manifest(type: Copy) {
diff --git a/Project/js_sdk/libs/android-support-v4.jar b/Project/js_sdk/libs/android-support-v4.jar
deleted file mode 100644
index 2ff47f4..0000000
--- a/Project/js_sdk/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/Project/js_sdk/libs/lingleisdk-2.1.0.jar b/Project/js_sdk/libs/lingleisdk-2.1.0.jar
deleted file mode 100644
index 2572ab2..0000000
--- a/Project/js_sdk/libs/lingleisdk-2.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/Project/js_sdk/libs/lingleisdk-3.0.1.jar b/Project/js_sdk/libs/lingleisdk-3.0.1.jar
new file mode 100644
index 0000000..42ca2bd
--- /dev/null
+++ b/Project/js_sdk/libs/lingleisdk-3.0.1.jar
Binary files differ
diff --git a/Project/js_sdk/proguard-rules.pro b/Project/js_sdk/proguard-rules.pro
index 0784294..1399764 100644
--- a/Project/js_sdk/proguard-rules.pro
+++ b/Project/js_sdk/proguard-rules.pro
@@ -51,5 +51,11 @@
-dontwarn com.linglei.sdklib.**
-keep class com.lingleigame.ad.sdk.**{*;}
-dontwarn com.lingleigame.ad.sdk.**
+-dontwarn android.net.**
+-keep class android.net.** { *;}
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+-dontwarn com.android.internal.http.multipart.**
+-keep class com.android.internal.http.multipart.** { *;}
-dontwarn com.secondworld.univeralsdk.**
-keep class com.secondworld.univeralsdk.** { *;}
\ No newline at end of file
diff --git a/Project/js_sdk/src/game_jisugame/AndroidManifest.xml b/Project/js_sdk/src/game_jisugame/AndroidManifest.xml
index ad0ca34..f534267 100644
--- a/Project/js_sdk/src/game_jisugame/AndroidManifest.xml
+++ b/Project/js_sdk/src/game_jisugame/AndroidManifest.xml
@@ -20,6 +20,14 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+
+ <!--涓嬮潰鏂板鏉冮檺-->
+ <!--8.0-->
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+ 鈥�
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<!-- 濡傛灉鎮ㄥ綋鍓嶅簲鐢ㄧ▼搴忔湁鑷繁鐨凙pplication锛屽垯蹇呴』缁ф壙com.linglei.sdk.openapi.LLApplication-->
<!-- 濡傛灉娌℃湁锛岃鎸囧畾application鐨刵ame灞炴�т负com.linglei.sdk.openapi.LLApplication -->
@@ -66,6 +74,25 @@
android:name="com.linglei.sdklib.open.LLService"
android:exported="false" />
+ <!-- Required FileProvider {鎮ㄧ殑鍖呭悕璇蜂慨鏀逛负褰撳墠鍖呭悕}-->
+ <provider
+ android:name="com.linglei.sdklib.open.LLFileProvider"
+ android:authorities="{appId}.llsdk_fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.LLSDK.FILE_PROVIDER_PATHS"
+ android:resource="@xml/llsdk_filepaths" />
+ </provider>
+
+ <!-- Required -->
+ <activity
+ android:name="com.linglei.sdklib.permission.PermissionActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:launchMode="standard"
+ android:theme="@style/LLPermission.Theme.Activity"
+ android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+
</application>
</manifest>
\ No newline at end of file
diff --git a/Project/js_sdk/src/game_jisugame/res/layout/llsdk_demo_activity_main.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_demo_activity_main.xml
new file mode 100644
index 0000000..51dae7f
--- /dev/null
+++ b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_demo_activity_main.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/ll_demo_login"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="璋冪敤鐧诲綍" />
+
+ <Button
+ android:id="@+id/ll_demo_switch_account"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鍒囨崲璐﹀彿" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/ll_demo_pay001"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鏀粯0.01鍏�" />
+
+ <Button
+ android:id="@+id/ll_demo_pay01"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鏀粯0.1鍏�" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/ll_demo_pay1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鏀粯1鍏�" />
+
+ <Button
+ android:id="@+id/ll_demo_pay6"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鏀粯6鍏�" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ android:background="@android:color/holo_orange_light"
+ android:orientation="horizontal">
+ <EditText
+ android:layout_width="0dp"
+ android:layout_height="46dp"
+ android:layout_weight="1"
+ android:id="@+id/ll_demo_pay_custom_et"
+ android:textColorHint="@android:color/white"
+ android:hint="鑷畾涔夐噾棰�(鍒�)"
+ android:inputType="number"
+ android:paddingLeft="10dp"
+ android:textColor="@android:color/white"
+ android:background="@android:color/holo_green_light"/>
+
+ <Button
+ android:id="@+id/ll_demo_pay_custom"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鑷畾涔夐噾棰濇敮浠�" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/ll_demo_login_info"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鑾峰彇鐧诲綍淇℃伅" />
+
+ <Button
+ android:id="@+id/ll_demo_sdk_version"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鑾峰彇SDK鐗堟湰" />
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml b/Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml
index 59b3beb..be7a31b 100644
--- a/Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml
+++ b/Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml
@@ -32,4 +32,38 @@
<string name="llsdk_rule_tip_four">2–15浣嶄腑鏂囧瓧绗�</string>
<string name="llsdk_rule_tip_five">18浣嶆暟瀛楄韩浠借瘉</string>
+
+ <!--permission-->
+ <string name="llsdk_permission_name_calendar">鏃ュ巻</string>
+ <string name="llsdk_permission_name_camera">鐩告満</string>
+ <string name="llsdk_permission_name_contacts">閫氳褰�</string>
+ <string name="llsdk_permission_name_location">浣嶇疆淇℃伅</string>
+ <string name="llsdk_permission_name_microphone">楹﹀厠椋�</string>
+ <string name="llsdk_permission_name_phone">鐢佃瘽</string>
+ <string name="llsdk_permission_name_sensors">韬綋浼犳劅鍣�</string>
+ <string name="llsdk_permission_name_sms">鐭俊</string>
+ <string name="llsdk_permission_name_storage">瀛樺偍绌洪棿</string>
+
+ <!--permission-->
+ <style name="LLPermission"/>
+ <style name="LLPermission.Theme">
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowDisablePreview">true</item>
+ <item name="android:windowIsTranslucent">true</item>
+ </style>
+ <style name="LLPermission.Theme.Activity">
+ </style>
+ <style name="LLPermission.Theme.Dialog">
+ <item name="android:backgroundDimEnabled">false</item>
+ <item name="android:windowIsFloating">false</item>
+ <item name="android:windowFrame">@null</item>
+ </style>
+
+ <!--toutiao-->
+ <string name="hours_ago">%d灏忔椂鍓�</string>
+ <string name="just_now">鍒氬垰</string>
+ <string name="minutes_ago">%d鍒嗛挓鍓�</string>
+
</resources>
diff --git a/Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml b/Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml
index 9501f5c..42fd004 100644
--- a/Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml
+++ b/Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml
@@ -10,6 +10,8 @@
<item name="android:windowAnimationStyle">@null</item>
<!--<item name="android:windowFullscreen">true</item>-->
<item name="android:backgroundDimEnabled">true</item>
+
+
</style>
<style name="llsdk_edit_tv">
@@ -42,4 +44,6 @@
<item name="android:textColor">@color/llsdk_color_white</item>
<item name="android:textSize">16sp</item>
</style>
+
+
</resources>
\ No newline at end of file
diff --git a/Project/js_sdk/src/game_jisugame/res/xml/llsdk_filepaths.xml b/Project/js_sdk/src/game_jisugame/res/xml/llsdk_filepaths.xml
new file mode 100644
index 0000000..c8f1d26
--- /dev/null
+++ b/Project/js_sdk/src/game_jisugame/res/xml/llsdk_filepaths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+ <external-path name="external-path" path="." />
+</paths>
\ No newline at end of file
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
index 5552449..cfe02b9 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -16,6 +16,7 @@
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
+import com.linglei.sdk.openapi.LLSDK;
import com.unity3d.player.UnityPlayerActivity;
public class MainActivity extends UnityPlayerActivity
@@ -198,4 +199,9 @@
super.onRestart();
}
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ LLSDK.getInstance().onKeyBack();
+ }
}
--
Gitblit v1.8.0