适配紫云jar包与游戏冲突 2

package_web.py

@@ -83,6 +83,7 @@ def package(config, sdk):
     # 必须参数
     jsonConfig['packageName'] = config['packageName']
     jsonConfig['name'] = config['name']
+    jsonConfig['game'] = game
 
     # 可选参数
     if 'outName' in config:

sdk/yfsdk/libs/config.json

@@ -1,5 +1,5 @@
 {
 	"default":[
-		"jimiAdSDK-1.0.5.jar"
+		"jimiAdSDK-1.0.7.jar"
 	]
 }

sdk/yfsdk/res/anim/jmad_layout_anim.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layoutAnimation
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:animation="@anim/layout_banner_anim_set"
+    android:animationOrder="normal"
+    android:delay="3">
+</layoutAnimation>

sdk/yfsdk/res/anim/layout_banner_anim_set.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="500"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:shareInterpolator="true">
+
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"/>
+    <translate
+        android:fromXDelta="300"
+        android:toXDelta="0"/>
+</set>

sdk/yfsdk/res/drawable-hdpi/jmad_banner_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:useLevel="false" >
+
+    <solid
+        android:color="#80FFFFFF" />
+
+    <corners android:radius="5dp"/>
+</shape>

sdk/yfsdk/res/drawable/bt_circle_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false" >
+    <padding
+        android:left="2dp"
+        android:top="1dp"
+        android:right="2dp"
+        android:bottom="1dp" />
+    <solid
+        android:color="@color/jmfont_black2" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/jmfont_white" />
+    <size android:width="25dp"
+        android:height="25dp" />
+</shape>

sdk/yfsdk/res/drawable/bt_icon_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:useLevel="false" >
+
+    <corners android:radius="20dp"/>
+</shape>

sdk/yfsdk/res/drawable/bt_page_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:useLevel="false" >
+
+    <solid
+        android:color="#FFFFFF" />
+
+    <corners android:radius="5dp"/>
+</shape>

sdk/yfsdk/res/drawable/jm_dialog_ios_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/jmfont_white"/>
+    <corners android:radius="10dp"/>
+</shape>

sdk/yfsdk/res/drawable/jm_dialog_tv_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="@color/jm_green_light" android:width="1px"/>
+    <corners android:radius="10dp"/>
+    <padding android:bottom="5dp"/>
+    <padding android:top="5dp"/>
+    <padding android:left="5dp"/>
+    <padding android:right="5dp"/>
+
+</shape>

sdk/yfsdk/res/drawable/jmad_button_bg.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:useLevel="false" >
+    <solid
+        android:color="#51BCF7"
+        />
+    <stroke
+        android:width="1dp"
+        android:color="#51BCF9" />
+    <corners android:radius="5dp" />
+</shape>

sdk/yfsdk/res/layout/dlg_dislike_custom.xml

@@ -0,0 +1,13 @@
+<?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">
+
+    <!-- 自定义样式选项，必须继承TTDislikeListView -->
+    <com.bytedance.sdk.openadsdk.dislike.TTDislikeListView
+        android:id="@+id/lv_dislike_custom"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

sdk/yfsdk/res/layout/jmad_ad_view.xml

@@ -0,0 +1,41 @@
+<?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" >
+
+<FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+        <WebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+                <Button
+                    android:id="@+id/close_btn"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:background="@drawable/jmad_close"
+                    android:scaleType="fitXY"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="20dp"
+                    android:shadowColor="@color/jmfont_black"
+                    android:shadowDx="2"
+                    android:shadowDy="2"
+                    android:shadowRadius="2"
+                    android:visibility="gone"/>
+
+        </RelativeLayout>
+
+
+</FrameLayout>
+
+
+</LinearLayout>

sdk/yfsdk/res/layout/jmad_banner_container.xml

@@ -0,0 +1,80 @@
+<?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="100dp"
+    android:background="@drawable/jmad_banner_bg"
+    android:orientation="horizontal">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <com.Jcat.Adsdk.view.RoundImageView
+            android:id="@+id/app_icon"
+            android:layout_width="65dp"
+            android:layout_height="65dp"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:background="@drawable/bt_icon_bg"
+            android:src="@drawable/jmad_img_placeholder"
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/app_icon"
+            android:layout_marginLeft="20dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/mainTitleView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="奇迹MU"
+                android:textColor="#000000"
+                android:textSize="16sp"
+                />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp">
+                <ImageView style="@style/jmad_star_style" />
+                <ImageView style="@style/jmad_star_style" />
+                <ImageView style="@style/jmad_star_style" />
+                <ImageView style="@style/jmad_star_style" />
+                <ImageView style="@style/jmad_star_style" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_starCount"
+                android:layout_width="180dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:singleLine="true"
+                android:text="PC中的经典，强势回归"
+                android:textColor="#646161"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/download_btn"
+            android:layout_width="90dp"
+            android:layout_height="36dp"
+            android:background="@drawable/jmad_button_bg"
+            android:text="立即下载"
+            android:textColor="@color/jmfont_white"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="20dp"
+            android:textSize="14sp" />
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>

sdk/yfsdk/res/layout/jmad_float_view.xml

@@ -0,0 +1,24 @@
+<?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">
+
+
+    <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/jmad_float" />
+
+    </FrameLayout>
+
+</FrameLayout>

sdk/yfsdk/res/layout/jmad_reward_view.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+   >
+    <LinearLayout
+        android:id="@+id/ll_video_player"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+        <FrameLayout
+            android:id="@+id/fl_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.Jcat.Adsdk.view.NiceVideoPlayer
+                android:id="@+id/nice_video_player"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                >
+
+            </com.Jcat.Adsdk.view.NiceVideoPlayer>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/ll_page"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        android:orientation="vertical">
+
+        <com.Jcat.Adsdk.view.WebImageView
+            android:id="@+id/image_page"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"></com.Jcat.Adsdk.view.WebImageView>
+        <RelativeLayout
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:background="#50000000"
+            android:layout_alignParentRight="true"
+            >
+            <Button
+                android:id="@+id/page_close_btn"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:background="@drawable/jmad_close"
+                android:scaleType="fitXY"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="20dp"
+                />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:orientation="vertical"
+                android:gravity="center"
+                >
+                <com.Jcat.Adsdk.view.RoundImageView
+                    android:id="@+id/app_icon"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:src="@drawable/jmad_img_placeholder"
+                    />
+
+                <TextView
+                    android:id="@+id/mainTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="奇迹MU"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="22sp"
+                    android:layout_marginTop="20dp"
+                    />
+
+                <TextView
+                    android:id="@+id/tv_gameDesc"
+                    android:layout_width="240dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:lines="3"
+                    android:text=""
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="18sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+                    <ImageView style="@style/jmad_big_star_style" />
+                    <ImageView style="@style/jmad_big_star_style" />
+                    <ImageView style="@style/jmad_big_star_style" />
+                    <ImageView style="@style/jmad_big_star_style" />
+                    <ImageView style="@style/jmad_big_star_style" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/jmfont_white"
+                        android:text="4.9"
+                        android:textSize="16sp"
+                        android:layout_marginLeft="5dp"
+                        />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tv_starCount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:singleLine="true"
+                    android:text="(255)"
+                    android:textColor="#646161"
+                    android:textSize="15sp" />
+
+
+                <Button
+                    android:id="@+id/download_btn"
+                    android:layout_width="120dp"
+                    android:layout_height="36dp"
+                    android:background="@drawable/jmad_button_bg"
+                    android:text="立即下载"
+                    android:textColor="@color/jmfont_white"
+                    android:layout_marginTop="15dp"
+                    android:textSize="14sp" />
+
+
+            </LinearLayout>
+
+
+
+        </RelativeLayout>
+
+
+
+    </RelativeLayout>
+
+
+
+
+
+
+
+</LinearLayout>

sdk/yfsdk/res/layout/jmad_user_info.xml

@@ -0,0 +1,15 @@
+<?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" >
+
+
+        <WebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+</LinearLayout>

sdk/yfsdk/res/layout/jmad_video_palyer_controller.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                >
+    <!--加载动画-->
+    <LinearLayout
+        android:id="@+id/loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            />
+
+        <!--<TextView-->
+            <!--android:id="@+id/load_text"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_marginTop="8dp"-->
+            <!--android:text="正在缓冲..."-->
+            <!--android:textColor="@android:color/white"-->
+            <!--android:textSize="13sp"/>-->
+    </LinearLayout>
+    <RelativeLayout
+        android:id="@+id/controll_rl"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+        <LinearLayout
+            android:id="@+id/close_LL"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginLeft="15dp"
+            android:orientation="horizontal"
+            android:gravity="center"
+            >
+
+            <!--<TextView-->
+                <!--android:id="@+id/reward_tv"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:text="观看15秒后，可获得奖励"-->
+                <!--android:textColor="@color/jmfont_white"-->
+                <!--android:textSize="16sp"-->
+                <!--android:gravity="center_horizontal"-->
+                <!--android:layout_marginLeft="10dp"-->
+                <!--/>-->
+
+            <TextView
+                android:id="@+id/count_time"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/bt_circle_bg"
+                android:gravity="center"
+                android:textSize="13sp"
+                android:textColor="@android:color/white"
+                android:layout_height="28dp"
+                android:layout_width="28dp"
+                />
+            <Button
+                android:id="@+id/volume_btn"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginLeft="15dp"
+                android:scaleType="fitXY"
+                />
+
+
+
+            <LinearLayout
+                android:id="@+id/count_time_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:orientation="horizontal">
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/banner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/jm_transparent"
+            android:animateLayoutChanges="true"
+            android:layoutAnimation="@anim/jmad_layout_anim"
+            android:orientation="horizontal"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="8dp"
+            android:layout_alignParentBottom="true"></LinearLayout>
+
+        <Button
+            android:id="@+id/close_btn"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:background="@drawable/jmad_close"
+            android:scaleType="fitXY"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="20dp"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
+
+</RelativeLayout>

sdk/yfsdk/res/values/jmad_colors.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="jmtransparent_background">#50000000</color>
+    <color name="jmfont_black">#000000</color>
+    <color name="jmfont_black2">#4D000000</color>
+    <color name="jmfont_white">#ffffff</color>
+    <color name="jmfont_blues">#2abfff</color>
+    <color name="jmfont_blues2">#5522ff</color>
+    <color name="jmfont_gray">#343434</color>
+    <color name="jmfont_gray2">#F5F5F5</color>
+    <color name="jmfont_red">#fe3837</color>
+    <color name="jm_other">#00000001</color>
+    <color name="jm_exit_dialog_bg">#94000000</color>
+    <color name="jm_dialog_line">#999999</color>
+    <color name="jm_transparent">@android:color/transparent</color>
+    <color name="jm_green">#2EBB45</color>
+    <color name="jm_green_light">#78D159</color>
+    <color name="jm_orange">#F88520</color>
+    <color name="jm_yellow">#FEDD21</color>
+    <color name="jm_auto_login_bg_4">#B2140C08</color>
+    <color name="jm_login_bg_4">#504A4A</color>
+    <color name="jm_input_layout_bg_4">#EBEBEB</color>
+    <color name="jm_float_text_4">#FFF9C8</color>
+    <color name="countDownText">#FFFFFF</color>
+    <color name="countDownForeground">#FFFFFF</color>
+    <color name="countDownBackground">#6A6A6A</color>
+</resources>

sdk/yfsdk/res/values/jmad_strings.xml

@@ -0,0 +1,5 @@
+<resources>
+    <string name="jm_confirm">确定</string>
+    <string name="jm_permission_tip_init">需要授权存储空间读写权限，手机权限才能正常使用</string>
+
+</resources>

sdk/yfsdk/res/values/jmad_styles.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="jmad_star_style">
+        <item name="android:layout_width">20dp</item>
+        <item name="android:layout_height">20dp</item>
+        <item name="android:background">@drawable/jmad_star</item>
+    </style>
+
+
+    <style name="jmad_big_star_style">
+        <item name="android:layout_width">28dp</item>
+        <item name="android:layout_height">28dp</item>
+        <item name="android:background">@drawable/jmad_star</item>
+    </style>
+</resources>

sdk_script/jm_zy_ysdk.py

@@ -50,5 +50,6 @@ def getSdkConfig(jsonConfig, config):
         else:
             jsonConfig['libConfig'] = 'default'
 
-        if config['app'] == 'ahlz':
+
+        if config['game'] == 'ahlz':
             jsonConfig['libConfig'] = 'ahlz'