添加紫云ysdk渠道

keystore/key.json

@@ -4,5 +4,15 @@
 		"storePassword":"susu123",
 		"keyAlias":"susu",
 		"keyPassword":"susu123"
+	},
+	"wzjh":{
+		"jm_ziyun_ysdk":{
+		"wzjh":{
+		"storeFile": "ziyun.jks",
+		"storePassword":"yh1234",
+		"keyAlias":"key0",
+		"keyPassword":"yh1234"
+	}
+	}
 	}
 }

package_utils.py

@@ -23,12 +23,14 @@ import importlib
 import uuid
 import zipfile
 
-ignoreLauncher = ['jm_ysdk', 'jm_yijie', 'jm_quick', 'jm_beiyu', 'jm_xq_jrtt']
+ignoreLauncher = ['jm_ysdk', 'jm_yijie', 'jm_quick', 'jm_beiyu', 'jm_xq_jrtt','jm_ziyun_ysdk']
 adaptApp = ['yjzx']
 
 def pack(game, sdk, config):
     config['cache'] = uuid.uuid1()
     subChannel = config['subChannel']
+    print('game = %s, sdk = %s, subChannel = %s, ...' % (game,sdk,subChannel))
+
     # 解包
     ret = decomplie(game, sdk, subChannel, config)
     if ret:
@@ -315,7 +317,7 @@ def copyAppRes(game, sdk, subChannel, config):
     # assets
     print('copy assets...')
     #适配一剑斩仙
-    if config['app'] in adaptApp:
+    if game in adaptApp:
         print('适配一剑斩仙...')
         decomplieAssetsPath = file_utils.getFullPath(decompliePath, 'assets')
         skinZipPath = os.path.join(decomplieAssetsPath, 'skin.zip')
@@ -336,6 +338,8 @@ def copyAppRes(game, sdk, subChannel, config):
                         temPath = 'skin/' + single_file
                         z.write(filepath, temPath)
             z.close()
+            if ret:
+                return ret
         else:
             print('normal copy assets...')
             assetsPath = file_utils.getFullPath(channelPath, 'assets')
@@ -1118,6 +1122,7 @@ def apksignerApk(game, sdk, subChannel, config):
     签名apk
     '''
     print('sign apk...')
+    print('game = %s, sdk = %s, subChannel = %s, ...' % (game,sdk,subChannel))
     path = os.path.join(file_utils.getCurrentPath(), 'keystore', 'key.json')
     jsonText = file_utils.readFile(path)
     signConfig = json.loads(jsonText)

package_web.py

@@ -9,6 +9,10 @@ import importlib
 
 sdkMapping = {
     'ysdk':'jm_ysdk',
+    'ziyun': {
+        'default': 'jm_zy',
+        'ysdk': 'jm_zy_ysdk',
+    },
     'xunqu':{
         'default':'jm_xq',
         'xiaomi':'jm_xq_mi',
@@ -47,6 +51,7 @@ def packageWeb():
 
     # 打包配置的路径
     packageConfig = sys.argv[1]
+    print('packageConfig --> ' +packageConfig)
 
     jsonText = file_utils.readFile(packageConfig)
     config = json.loads(jsonText)
@@ -74,7 +79,6 @@ def package(config, sdk):
         jsonConfig['subChannel'] = config['subChannel']
 
     # 必须参数
-    jsonConfig['app'] = config['app']
     jsonConfig['packageName'] = config['packageName']
     jsonConfig['name'] = config['name']
 
@@ -139,7 +143,7 @@ def getSdkConfig(sdk, jsonConfig, config):
     if not os.path.exists(targetScript):
         print('%s no exists' % targetScript)
         return 0
-
+    print('sdk_script -- > %s' % targetScript)
     sys.path.append(scriptPath)
     module = importlib.import_module(sdkScript)# 动态导入相应模块
     module.getSdkConfig(jsonConfig, config)# 执行脚本功能

sdk/jm_zy_ysdk/assets/com.tencent.open.config.json

@@ -0,0 +1,4 @@
+{
+	"Common_ta_enable": 1,
+	"Common_frequency": 24
+}

sdk/jm_zy_ysdk/assets/jmhy.properties

@@ -0,0 +1,2 @@
+version=20191121
+agent=556bgii6

sdk/jm_zy_ysdk/assets/sdk.properties

@@ -0,0 +1,13 @@
+sdkversion=101
+channel=aab
+dd=d8
+#ÊÖQid
+qqId = 1109953441
+#ÊÖQkey
+qqKey = GNJeRhHeYmbWe7Jg
+#wx id
+wxId = wx40a2a90204be5e0e
+#wx key
+wxKey = 6503bebef10fadfe6556807d71db8323
+
+memberKey="sdsdd"

sdk/jm_zy_ysdk/assets/ysdk_pubkey.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWm3fxNmUgu91NTYxGJwlG3dd5
+NIi0xDtmOSNDyqnXCSiN4F8izKHSf1mH5HiM4pbC92FKA5ky19gFHDVRu8ZBujc7
+zShdGcVWS8vy0VHXpvX5HpM+xY0ylEHVzte7mmHhvxRxkQM2cWcrdDCvYTgXPFcP
+E28/++FoGQyxpKvzuQIDAQAB
+-----END PUBLIC KEY-----

sdk/jm_zy_ysdk/assets/ysdkconf.ini

@@ -0,0 +1,22 @@
+;**************游戏相关配置, 游戏需要根据各自情况修改 START **********
+;游戏的QQAPPID
+QQ_APP_ID=1109953441
+
+;游戏的微信APPID
+WX_APP_ID=wx40a2a90204be5e0e
+
+;游戏的OFFER_ID
+OFFER_ID=1109953441
+;***************游戏配置项, 游戏需要根据各自情况修改 END **************
+
+;************* YSDK相关配置项,游戏需要根据各自情况修改 START **********
+;联调环境
+;YSDK_URL=https://ysdktest.qq.com
+;正式环境
+YSDK_URL=https://ysdk.qq.com
+;************** YSDK相关配置项,游戏需要根据各自情况修改 END **************
+;YSDK游戏内Icon开关
+YSDK_ICON_SWITCH=true
+YSDK_IMMERSIVE_ICON_SWITCH=true
+YSDK_MSG_BOX_SWITCH=true
+YSDK_ICON_CAPTURE_SWITCH=true

sdk/jm_zy_ysdk/assets/ysdkinfo.ini

@@ -0,0 +1,6 @@
+VERSION=1.4.5
+SVN_REVISION=1078
+BASE_LINE=Tag_YSDK_1.4.5.213_1078
+DATETIME=20181025
+OLD_TAG=Tag_YSDK_1.3.1.45_635
+

sdk/jm_zy_ysdk/libs/config.json

@@ -0,0 +1,16 @@
+{
+	"default":[
+		"android-support-v4.jar",
+		"commons-httpclient-3.1.jar",
+		"gson-2.5.jar",
+		"jm_sdk_20191108.jar",
+		"okhttp-2.4.0.jar",
+		"okio-1.8.0.jar",
+		"org.apache.http.legacy.jar",
+		"walle.jar",
+		"walle-reader-1.1.6.jar",
+		"YSDK_Android_1.4.5_1078.jar",
+		"ysdk_hackdex.jar",
+		"ziyun_lib_yyb_2.0.2.jar"
+	]
+}

sdk/jm_zy_ysdk/manifest.xml

@@ -0,0 +1,175 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<permissions>
+		<uses-permission android:name="android.permission.INTERNET" />
+		<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+		<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+		<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+		<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+		<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+		<uses-permission android:name="android.permission.GET_TASKS" />
+		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+		<uses-permission android:name="android.permission.RESTART_PACKAGES" />
+		<uses-permission android:name="android.permission.READ_SMS" />
+	    <uses-permission android:name="android.permission.SEND_SMS"/>
+	    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+	    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+	</permissions>
+
+    <application>
+		<!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <activity
+            android:name="com.jmhy.sdk.activity.JmLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmAutoLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmUserinfoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmpayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmCommunityActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+			android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.ForceActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <service android:name="com.jmhy.sdk.push.PushService" />
+	
+        <!-- TODO SDK接入 QQ接入配置 START -->
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="tencent${qqAppId}" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <!-- TODO SDK接入 QQ接入配置 END -->
+
+        <!-- TODO SDK接入 微信接入配置 START -->
+        <activity
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+			android:configChanges="orientation|screenSize|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:label="WXEntryActivity"
+            android:launchMode="singleTop"
+            android:taskAffinity="${applicationId}.diff"
+			android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <!-- 注意：此处应改为 游戏的微信appid -->
+                <data android:scheme="${wechatAppId}" />
+            </intent-filter>
+        </activity>
+		<activity android:name="com.tencent.ysdk.module.user.impl.wx.qrcode.QRActivity"/>
+        <!-- TODO SDK接入 微信接入配置 END -->
+
+        <!-- TODO GAME SDK接入YSDK实名制接入配置 START -->
+        <activity
+            android:name="com.tencent.ysdk.module.realName.impl.RegisterRealNameActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="sensor"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+        <!-- TODO GAME SDK接入YSDK实名制接入配置 END -->
+
+        <!-- TODO GAME SDK Midas接入配置 START -->
+        <activity
+            android:name="com.tencent.midas.proxyactivity.APMidasPayProxyActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:screenOrientation="${screenOrientation}"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name="com.tencent.midas.wx.APMidasWXPayActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true" />
+
+        <activity
+            android:name="com.tencent.midas.qq.APMidasQQWalletActivity"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="qwallet100703379"/>
+                <!-- TODO GAME 这里为米大师的默认配置，游戏不要修改 -->
+            </intent-filter>
+        </activity>
+        <activity android:name="com.tencent.midas.jsbridge.APWebJSBridgeActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
+        <!-- TODO GAME SDK Midas接入配置 END -->
+
+        <!-- ysdk登录界面 -->
+        <activity
+            android:name="com.inner.sdk.ui.YsdkLoginActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:launchMode="singleTop"
+            android:theme="@style/ysdk_Dialog"/>
+
+			        <!-- 浩宇支付start -->
+        <activity android:name="com.ziyun.pay.PayWebViewActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:exported="false"
+            android:screenOrientation="behind"
+            android:windowSoftInputMode="adjustResize|stateHidden" >
+        </activity>
+        <!-- 浩宇支付end -->
+        <!-- qq会员 -->
+        <activity android:name="com.ziyun.ui.QQMemberActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:exported="false"
+            android:screenOrientation="behind"
+            android:windowSoftInputMode="adjustResize|stateHidden" >
+        </activity>
+        <!-- qq会员 end -->
+    </application>
+</manifest>

sdk/jm_zy_ysdk/res/anim/unipay_anim_in_from_left.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" 
+	 android:interpolator="@android:anim/accelerate_interpolator">
+     <translate 
+     android:fromXDelta="-100%p" 
+     android:toXDelta="0%p"
+     android:duration="200" />
+</set>
+				
+<!-- From: file:/data1/rdm/projects/18500/ysdk/src/main/res/anim/unipay_anim_in_from_left.xml -->

sdk/jm_zy_ysdk/res/anim/unipay_anim_in_from_right.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--   -->
+<set xmlns:android="http://schemas.android.com/apk/res/android" 
+	 android:interpolator="@android:anim/accelerate_interpolator">
+     <translate android:fromXDelta="100%p" 
+     android:toXDelta="0%p"
+     android:duration="200" />
+</set>
+				
+<!-- From: file:/data1/rdm/projects/18500/ysdk/src/main/res/anim/unipay_anim_in_from_right.xml -->

sdk/jm_zy_ysdk/res/anim/unipay_anim_out_to_left.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" 
+	 android:interpolator="@android:anim/accelerate_interpolator">
+    <translate 
+    android:fromXDelta="0%p" 
+    android:toXDelta="-100%p"
+    android:duration="200" />
+</set>
+<!-- From: file:/data1/rdm/projects/18500/ysdk/src/main/res/anim/unipay_anim_out_to_left.xml -->

sdk/jm_zy_ysdk/res/anim/unipay_anim_out_to_right.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" 
+	 android:interpolator="@android:anim/accelerate_interpolator">
+    <translate 
+    android:fromXDelta="0%p" 
+    android:toXDelta="100%p"
+    android:duration="200" />
+</set>
+<!-- From: file:/data1/rdm/projects/18500/ysdk/src/main/res/anim/unipay_anim_out_to_right.xml -->