update 极速sdk相关修改提交

client_Hale

2019-01-09 14a766de7ddaf2c5e6e0fc0e1d2040fe24bfa72f

update 极速sdk相关修改提交

 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" />

 ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar

Binary files differ

 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) {

 Project/js_sdk/libs/android-support-v4.jar

Binary files differ

 Project/js_sdk/libs/lingleisdk-2.1.0.jar

Binary files differ

 Project/js_sdk/libs/lingleisdk-3.0.1.jar

Binary files differ

 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.** { *;}

 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"/>

    <!-- 如果您当前应用程序有自己的Application，则必须继承com.linglei.sdk.openapi.LLApplication-->
    <!-- 如果没有，请指定application的name属性为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>

 Project/js_sdk/src/game_jisugame/res/layout/llsdk_demo_activity_main.xml

New file
@@ -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>

 Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml

@@ -32,4 +32,38 @@
    <string name="llsdk_rule_tip_four">2&#8211;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>

 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>

 Project/js_sdk/src/game_jisugame/res/xml/llsdk_filepaths.xml

New file
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
    <external-path name="external-path" path="." />
</paths>

 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();
    }
}