新增皮肤6

config_utils.py

@@ -104,4 +104,14 @@ def getDate():
     '''
     获取日期
     '''
-    return time.strftime("%Y%m%d", time.localtime()) 
+    return time.strftime("%Y%m%d", time.localtime())
+
+def getTime(seconds):
+    '''
+    获取时间
+    '''
+    time = int(seconds)
+    if time < 60:
+        return time + '秒'
+    else:
+        return str(round(time/60)) + '分' + str(time%60) + '秒'

package_utils.py

@@ -22,9 +22,13 @@ import sys
 import importlib
 import uuid
 import zipfile
+import time
+import datetime
+
 
 ignoreLauncher = ['jm_ysdk', 'jm_yijie', 'jm_quick', 'jm_beiyu', 'jm_xq_jrtt','jm_zy_ysdk']
 adaptApp = ['yjzx']
+startTime = ''
 
 def pack(game, sdk, config):
     config['cache'] = uuid.uuid1()
@@ -160,6 +164,13 @@ def pack(game, sdk, config):
     if config['clearCache']:
         clearTemp(game, sdk, subChannel, config)
 
+    endTime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+    d1 = datetime.datetime.strptime(endTime, '%Y-%m-%d %H:%M:%S')
+    d2 = datetime.datetime.strptime(startTime,  '%Y-%m-%d %H:%M:%S')
+    d = d1 - d2
+    print ('开始时间：' + startTime)
+    print ('结束时间：' + endTime)
+    print ('用时：{}'.format(config_utils.getTime(d.seconds)))
     return 0
 
 def decomplie(game, sdk, subChannel, config):
@@ -1227,6 +1238,8 @@ def packConsole(game, sdk, subChannel):
     if not os.path.exists(file_utils.getFullSDKPath(sdk)):
         print('sdk "%s" not exists' % sdk)
         return 1
+    global  startTime
+    startTime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
     # 读取配置
     channelPath = file_utils.getChannelPath(game, sdk)

package_web.py

@@ -110,6 +110,7 @@ def package(config, sdk):
     # sdk相关参数
     if 'properties' in config:
         jsonConfig['properties'] = config['properties']
+        jsonConfig['properties']['isDebugMode'] = 'false'
 
     jsonConfig['logSdk'] = ['jrtt', 'gdt']
 

sdk/jm/res/layout/jm_float_view.xml

@@ -6,12 +6,12 @@
 
     <LinearLayout
         android:id="@+id/ll_menu"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingLeft="56dp"
         android:background="@drawable/jmfloat_bg"
         android:gravity="center"
         android:orientation="horizontal"
+        android:paddingLeft="56dp"
         android:paddingRight="12dp"
         android:visibility="gone"
         tools:visibility="visible">
@@ -21,6 +21,7 @@
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_marginTop="2dp">
+
             <LinearLayout
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -47,7 +48,7 @@
                 android:layout_gravity="end"
                 android:layout_marginRight="10dp"
                 android:src="@drawable/jm_message_tip"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </FrameLayout>
 
         <ImageView
@@ -61,6 +62,7 @@
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_marginTop="2dp">
+
             <LinearLayout
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -87,7 +89,7 @@
                 android:layout_gravity="end"
                 android:layout_marginRight="10dp"
                 android:src="@drawable/jm_message_tip"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </FrameLayout>
 
         <ImageView

sdk/jm/res/values-port/jm_strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="setuser_text_title">注册成功</string>
-</resources>

sdk/jm/res/values-zh-rCN/jm_strings.xml

@@ -67,4 +67,8 @@
     <string name="jm_error_password_confirm">密码不一致</string>
     <string name="jm_empty_email">请输入邮箱</string>
     <string name="jm_password_again">请再次输入密码</string>
+    <string name="jm_next_step">下一步</string>
+    <string name="jm_user_protocol">用户协议</string>
+    <string name="jm_contact_kefu">联系客服</string>
+
 </resources>

sdk/jm/res/values/jm_colors.xml

@@ -7,6 +7,8 @@
     <color name="jmfont_blues">#2abfff</color>
     <color name="jmfont_gray">#343434</color>
     <color name="jmfont_red">#fe3837</color>
+    <color name="jmbtn6_red">#fe3837</color>
+    <color name="jmbtn6_red_light">#f85653</color>
     <color name="jm_other">#00000001</color>
     <color name="jm_exit_dialog_bg">#94000000</color>
     <color name="jm_dialog_line">#999999</color>
@@ -17,6 +19,8 @@
     <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_login_bg_6">#F8F8F8</color>
+    <color name="jm_input_bg_6">#F8F8ee</color>
     <color name="jm_input_layout_bg_4">#EBEBEB</color>
     <color name="jm_float_text_4">#FFF9C8</color>
 </resources>

sdk/jm/res/values/jm_dimens.xml

@@ -8,12 +8,15 @@
     <dimen name="jm_login_height_3">250dp</dimen>
     <dimen name="jm_login_width_4">333dp</dimen>
     <dimen name="jm_login_height_4">243dp</dimen>
+    <dimen name="jm_login_width_6">333dp</dimen>
+    <dimen name="jm_login_height_6">223dp</dimen>
     <dimen name="jm_register_height_old">314dp</dimen>
     <dimen name="jm_guest_height_old">287dp</dimen>
     <dimen name="jm_auto_login_height">300dp</dimen>
     <dimen name="jm_input_height">48dp</dimen>
     <dimen name="jm_login_top_height">70dp</dimen>
     <dimen name="jm_login_top_height_4">56dp</dimen>
+    <dimen name="jm_login_top_height_6">38dp</dimen>
     <dimen name="jm_login_submit_margin_top">45dp</dimen>
     <dimen name="jm_forget_text_margin_top">12dp</dimen>
     <dimen name="jm_login_logo_width">30dp</dimen>

sdk/jm/res/values/jm_strings.xml

@@ -67,4 +67,8 @@
     <string name="jm_error_password_confirm">密码不一致</string>
     <string name="jm_empty_email">请输入邮箱</string>
     <string name="jm_password_again">请再次输入密码</string>
+    <string name="jm_next_step">下一步</string>
+    <string name="jm_user_protocol">用户协议</string>
+    <string name="jm_contact_kefu">联系客服</string>
+
 </resources>