升级广点通，全渠道更新皮肤7 sdk版本1.3.8

config_utils.py

@@ -50,7 +50,9 @@ def checkChannelConfig(config):
     if 'logSdk' in config:
         log = config['logSdk']
         setLog(config, log)
-        
+
+
+
     return True
 
 def setLog(config, logSdk):

currentSdk/res/drawable/jmfloat_bg_red.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/jmfont_reds" />
+
+            <solid android:color="#ffffff" />
+
+            <corners
+                android:topRightRadius="25dp"
+                android:topLeftRadius="25dp"
+                android:bottomRightRadius="25dp"
+                android:bottomLeftRadius="25dp"
+                />
+            
+        </shape>
+    </item>
+
+</selector>

currentSdk/res/layout/jm_float_view_red.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="56dp">
+
+    <LinearLayout
+        android:id="@+id/ll_menu"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="@drawable/jmfloat_bg_red"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="56dp"
+        android:paddingRight="12dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <FrameLayout
+            android:id="@+id/tv_account"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="2dp">
+
+            <LinearLayout
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/jm_float_icon_size"
+                    android:layout_height="@dimen/jm_float_icon_size"
+                    android:src="@drawable/jm_float_user_red" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_user_msg"
+                    android:textColor="@color/jmfont_reds"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/account_tip"
+                android:layout_width="@dimen/jm_float_tip_size"
+                android:layout_height="@dimen/jm_float_tip_size"
+                android:layout_gravity="end"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/jm_message_tip"
+                android:visibility="gone" />
+        </FrameLayout>
+
+        <ImageView
+            android:id="@+id/tv_gift_line"
+            android:layout_width="2dp"
+            android:layout_height="35dp"
+            android:src="@drawable/jm_interval_red" />
+
+        <FrameLayout
+            android:id="@+id/tv_gift"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="2dp">
+
+            <LinearLayout
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/jm_float_icon_size"
+                    android:layout_height="@dimen/jm_float_icon_size"
+                    android:src="@drawable/jm_float_gift_red" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_gift"
+                    android:textColor="@color/jmfont_reds"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/gift_tip"
+                android:layout_width="@dimen/jm_float_tip_size"
+                android:layout_height="@dimen/jm_float_tip_size"
+                android:layout_gravity="end"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/jm_message_tip"
+                android:visibility="gone" />
+        </FrameLayout>
+
+        <ImageView
+            android:id="@+id/tv_kefu_line"
+            android:layout_width="2dp"
+            android:layout_height="35dp"
+            android:src="@drawable/jm_interval_red" />
+
+        <LinearLayout
+            android:id="@+id/tv_kefu"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="2dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="@dimen/jm_float_icon_size"
+                android:layout_height="@dimen/jm_float_icon_size"
+                android:src="@drawable/jm_float_service_red" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/float_kefu_msg"
+                android:textColor="@color/jmfont_reds"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/float_view"
+        android:layout_width="30dp"
+        android:layout_height="56dp"
+        android:padding="2dp"
+        tools:visibility="gone">
+        <ImageView
+            android:id="@+id/float_view_icon_imageView"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_gravity="start|center_vertical"
+            android:scaleType="fitStart"
+            android:src="@drawable/jm_float" />
+
+        <ImageView
+            android:id="@+id/icon_tip"
+            android:layout_width="@dimen/jm_float_tip_size"
+            android:layout_height="@dimen/jm_float_tip_size"
+            android:layout_gravity="end"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="2dp"
+            android:src="@drawable/jm_message_tip"
+            android:visibility="gone"/>
+    </FrameLayout>
+
+</FrameLayout>

currentSdk/res/layout/jmuser_realname.xml

@@ -0,0 +1,27 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <com.jmhy.sdk.view.CornerCompatView
+        android:id="@+id/content"
+        android:layout_width="@dimen/jm_realname_width"
+        android:layout_height="@dimen/jm_realname_height"
+        app:jm_radius="@dimen/jm_webview_radius"
+        android:background="@color/jmfont_red">
+
+        <WebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+       <com.jmhy.sdk.view.GifImageView
+            android:id="@+id/gif"
+            android:layout_width="240dp"
+            android:layout_height="240dp"
+            android:layout_gravity="center" />
+    </com.jmhy.sdk.view.CornerCompatView>
+</LinearLayout>

currentSdk/res/values-port/jm_dimens.xml

@@ -8,4 +8,6 @@
     <dimen name="jm_exit_dialog_height">275dp</dimen>
     <dimen name="jm_notice_width">338dp</dimen>
     <dimen name="jm_notice_height">369dp</dimen>
+    <dimen name="jm_realname_width">330dp</dimen>
+    <dimen name="jm_realname_height">370dp</dimen>
 </resources>

currentSdk/res/values/jm_colors.xml

@@ -5,6 +5,7 @@
     <color name="jmfont_black">#000000</color>
     <color name="jmfont_white">#ffffff</color>
     <color name="jmfont_blues">#2abfff</color>
+    <color name="jmfont_reds">#df384a</color>
     <color name="jmfont_gray">#343434</color>
     <color name="jmfont_red">#fe3837</color>
     <color name="jmbtn6_red">#fe3837</color>

currentSdk/res/values/jm_dimens.xml

@@ -37,4 +37,6 @@
     <dimen name="jm_notice_radius">8dp</dimen>
     <dimen name="jm_pay_width">330dp</dimen>
     <dimen name="jm_pay_height">330dp</dimen>
+    <dimen name="jm_realname_width">510dp</dimen>
+    <dimen name="jm_realname_height">300dp</dimen>
 </resources>

package_utils.py

@@ -15,6 +15,7 @@ import xml_utils
 import smali_utils
 import config_utils
 import game_utils
+import common_utils
 import os
 import os.path
 import json
@@ -150,6 +151,10 @@ def pack(game, sdk, config):
     if ret:
         return ret
 
+    #继承JMApplication
+    common_utils.changeApplication(game, sdk, subChannel, config, 'com.jmhy.sdk.common.JMApplication')
+
+
     # 生成R文件
     '''ret = generateNewRFile(game, sdk, subChannel, config)
     if ret:

package_web.py

@@ -119,6 +119,17 @@ def package(config, sdk):
 
     jsonConfig['logSdk'] = ['jrtt', 'gdt']
 
+    #广点通参数
+    if 'gdt_params' in config:
+        gdt = { 'gdt':config['gdt_params']}
+        if 'configData' in jsonConfig:
+            configData = jsonConfig['configData']
+            configData['channel_sdk_list'] = gdt
+        else:
+            jsonConfig['configData'] = {
+                'channel_sdk_list':gdt
+            }
+
     # 获取sdk相关配置
     getSdkConfig(sdk, jsonConfig, config)