添加天瑀、天宇游渠道

package_utils_yfsdk.py

@@ -40,9 +40,9 @@ def pack(game, sdk, config):
     if ret:
         return ret
         # 删除旧代码
-    # ret = removeOldCode(game, sdk, subChannel, config)
-    # if ret:
-    #     return ret
+    ret = removeOldCode(game, sdk, subChannel, config)
+    if ret:
+        return ret
 
     # 复制app res资源
     ret = copyAppRes(game, sdk, subChannel, config)
@@ -71,9 +71,9 @@ def pack(game, sdk, config):
 
     ret = copyIcon(game, sdk, subChannel, config)
 
-    # ret = packJar(game, sdk, subChannel, config)
-    # if ret:
-    #     return ret
+    ret = packJar(game, sdk, subChannel, config)
+    if ret:
+        return ret
 
     # 增加配置文件
     ret = createJmhyProperties(game, sdk, subChannel, config)
@@ -806,6 +806,7 @@ def packJar(game, sdk, subChannel, config):
 
     # 找到所有lib依赖
     sdkPath = file_utils.getFullSDKPath(sdk)
+    print('sdkpath --> ' + sdkPath)
     libs = os.path.join(sdkPath, 'libs')
     libConfig = os.path.join(libs, 'config.json')
 
@@ -839,7 +840,7 @@ def packJar(game, sdk, subChannel, config):
 
     # sdk实现类
     print('packageing all jar ...')
-    dexCmd += ' ' + os.path.join(sdkPath, '%s.jar' % sdk)
+    #dexCmd += ' ' + os.path.join(sdkPath, '%s.jar' % sdk)
     ret = file_utils.execJarCmd(dx, dexCmd)
     if ret:
         return ret

sdk/jm_tianyu/assets/tycollect.json

@@ -0,0 +1,9 @@
+{
+  "gid": "${appid}",
+  "adid": "0",
+  "trackid": "",
+  "track_channel_id": "_default_",
+  "trackcls": [
+    "com.tygame.tianyu.track.impl.TTTrack"
+  ]
+}

sdk/jm_tianyu/libs/config.json

@@ -0,0 +1,11 @@
+{
+	"default":[
+		"android-support-v4.jar",
+		"commons-httpclient-3.1.jar",
+		"org.apache.http.legacy.jar",
+		"walle.jar",
+		"walle-reader-1.1.6.jar",
+		"ty_game_1.3.0.jar",
+		"jm_sdk_20200221.jar"
+	]
+}

sdk/jm_tianyu/manifest.xml

@@ -0,0 +1,83 @@
+<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_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.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!-- 读取手机IMEI的权限，须在获得此权限后再初始化sdk，如果缺少此权限，会以AndroidID作为设备唯一标识符 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- 获取gps的权限 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!-- 读sd卡的权限 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 注：Android系统版本6.0以上，必须先获取权限，再调用初始化接口。 -->
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+	</permissions>
+
+    <application>
+		<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" />
+
+		  <activity
+            android:name="com.tygame.tianyu.TYGameActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+        </activity>
+
+        <service
+            android:name="com.tygame.tianyu.TYCEService"
+            android:process=":tianyu" />
+    </application>
+</manifest>

sdk/jm_tianyu/res/drawable/jm_agree_button_4.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>   
+<selector xmlns:android="http://schemas.android.com/apk/res/android">   
+    <item   
+    android:state_checked="false"   
+    android:drawable="@drawable/jm_agree_4" />
+    <item   
+    android:state_checked="true"   
+    android:drawable="@drawable/jm_agree_on_4" />
+</selector> 

sdk/jm_tianyu/res/drawable/jm_agree_button_6.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>   
+<selector xmlns:android="http://schemas.android.com/apk/res/android">   
+    <item   
+    android:state_checked="false"   
+    android:drawable="@drawable/jm_unckeck6" />
+    <item   
+    android:state_checked="true"   
+    android:drawable="@drawable/jm_check6" />
+</selector> 

sdk/jm_tianyu/res/drawable/jm_auto_login_bg_4.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/jm_auto_login_bg_4"/>
+    <corners android:radius="17dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_backlogin_btn.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+            <gradient android:startColor="#50000000" android:endColor="#50000000" android:angle="270.0" />
+        </shape>
+    </item>
+</selector>

sdk/jm_tianyu/res/drawable/jm_blues_codebtn_style.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+            <gradient android:startColor="#2abfff" android:endColor="#2abfff" android:angle="270.0" />
+        </shape>
+    </item>
+</selector>

sdk/jm_tianyu/res/drawable/jm_blues_codebtn_style_new.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+            <gradient android:startColor="#2abfff" android:endColor="#2abfff" android:angle="270.0" />
+        </shape>
+    </item>
+</selector>

sdk/jm_tianyu/res/drawable/jm_button_cancel_4.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/jm_dialog_line"/>
+    <corners android:radius="17dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_getcode_4.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="3dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_getcode_6.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/jmbtn6_red"/>
+    <corners android:radius="3dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_login_4.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/jm_orange"/>
+    <corners android:radius="7dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_nextstep_6.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/jmbtn6_red"/>
+    <corners android:radius="5dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_register_4.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/jm_dialog_line"/>
+    <corners android:radius="7dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_button_setpass_4.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/jm_orange"/>
+    <corners android:radius="17dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_cut_btn.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
+            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+            <gradient android:startColor="#ffffff" android:endColor="#ffffff" android:angle="270.0" />
+        </shape>
+    </item>
+</selector>

sdk/jm_tianyu/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/jm_tianyu/res/drawable/jm_exit_dialog_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/jm_exit_dialog_bg"/>
+    <corners android:radius="5dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_green_codebtn_style.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/jm_green"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_green_light_codebtn_style.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/jm_green_light"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_input_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">
+    <stroke android:color="@color/jmfont_blues" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

sdk/jm_tianyu/res/drawable/jm_input_layout_bg_4.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/jm_input_layout_bg_4"/>
+    <corners android:radius="7dp"/>
+</shape>