全渠道更新1.3.3

ReplaceJar.py

@@ -1,100 +0,0 @@
-#! /usr/bin/python
-# -*- coding: UTF-8 -*-
-
-# coding: utf-8
-
-import os,sys
-import random
-import string
-import re
-import time
-import json
-import shutil
-import hashlib
-import time
-import argparse
-
-import sys
-
-script_path = os.path.split(os.path.realpath(sys.argv[0]))[0]
-currentSdkpath = script_path + '/currentSdk'
-sdkpath = script_path + '/sdk'
-
-
-ignore_path_text = [".a", ".storyboard", ".py",".framework",".DS_Store",".xcuserstate",".jpg",".png"]
-
-keyFile = 'zooKeys.json'
-
-
-
-
-def replaceJarNameInFile(full_path, new_text, old_text):
-    with open(full_path, "r") as fileObj:
-        all_text = fileObj.read()
-        fileObj.close()
-    if old_text:
-        all_text = all_text.replace(old_text, new_text)
-        print ("\t替换: %s -> %s" % (old_text, new_text))
-        with open(full_path, "w") as fileObj:
-            fileObj.write(all_text)
-            fileObj.close()
-    else:
-        print ('cant not find old text')
-
-
-
-def getoldJarDate(full_path):
-    with open(full_path, "r") as fileObj:
-        all_text = fileObj.read()
-        fileObj.close()
-        # 提取jar包日期
-    old_text = (re.findall(r'jm_sdk_([^.jar]+)', all_text)[0])
-    return old_text
-
-def main():
-    global  sdkpath
-    global  currentSdkpath
-    print ('start replace jar ...')
-    print (sdkpath)
-    jarName = ''
-    for parent, folders, files in os.walk(currentSdkpath):
-        for file in files:
-            if file.find(".jar") > -1:
-                jarName = file
-                print('jarName -->'+ jarName)
-    fullJarPath = os.path.join(currentSdkpath,jarName)
-    newDate = (re.findall(r'jm_sdk_([^.jar]+)', jarName)[0])
-
-    #修改config字段 及替换Jar包
-    list = os.listdir(sdkpath)
-    for l in list:
-        full_l_path = os.path.join(sdkpath,l)
-        full_lib_path = os.path.join(full_l_path,'libs')
-        if os.path.isdir(full_l_path):
-            configPath = os.path.join(full_l_path,'libs/config.json')
-            configPath = os.path.normcase(configPath)
-            if os.path.exists(configPath):
-                print(configPath)
-                oldDate = getoldJarDate(configPath)
-                # 修改config字段
-                replaceJarNameInFile(configPath,newDate,oldDate)
-                oldJarPath = '%s/jm_sdk_%s.jar' % (full_lib_path,oldDate)
-                #删除旧文件
-                if os.path.exists(oldJarPath):
-                    print ('delete ---> %s' % oldJarPath)
-                    try:
-                        os.remove(os.path.normcase(oldJarPath))
-                    except Exception as e:
-                        print (e)
-                    else:
-                        print("File is deleted successfully")
-                newJarPath = '%s/jm_sdk_%s.jar' % (full_lib_path,newDate)
-                print('复制： %s ---> %s' % (fullJarPath,newJarPath))
-                shutil.copyfile(fullJarPath, newJarPath)  # 复制文件
-
-                print('-------------------------')
-
-    print ("\nfinished")
-
-if __name__ == "__main__":
-    main()

sdk/jm_beiyu/libs/config.json

@@ -17,6 +17,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	]
 }

sdk/jm_beiyu/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_beiyu/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_beiyu/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_beiyu/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_beiyu/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_beiyu/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_beiyu/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>

sdk/jm_cangyu/libs/config.json

@@ -6,6 +6,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	]
 }

sdk/jm_cangyu/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_cangyu/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_cangyu/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_cangyu/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_cangyu/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_cangyu/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_cangyu/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>

sdk/jm_jq/libs/config.json

@@ -7,6 +7,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	]
 }

sdk/jm_jq/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_jq/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_jq/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_jq/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_jq/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_jq/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_jq/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>

sdk/jm_oppo/libs/config.json

@@ -6,7 +6,7 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	],
 	"nopay":[
 		"gamesdk-20180621.jar",
@@ -15,6 +15,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20191108.jar"
+		"jm_sdk_nopay_20191225.jar"
 	]
 }

sdk/jm_oppo/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_oppo/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_oppo/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_oppo/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_oppo/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_oppo/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_oppo/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>

sdk/jm_quick/libs/config.json

@@ -6,6 +6,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	]
 }

sdk/jm_quick/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_quick/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_quick/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_quick/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_quick/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_quick/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_quick/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>

sdk/jm_qytx/libs/config.json

@@ -6,7 +6,7 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20191108.jar"
+		"jm_sdk_20191225.jar"
 	],
 	"nopay":[
 		"android-support-v4.jar",
@@ -15,6 +15,6 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20191108.jar"
+		"jm_sdk_nopay_20191225.jar"
 	]
 }

sdk/jm_qytx/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_qytx/res/layout/jmnotice.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_qytx/res/layout/jmuserinfo.xml

@@ -8,8 +8,8 @@
 
     <com.jmhy.sdk.view.CornerCompatView
         android:id="@+id/content"
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_qytx/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_qytx/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_qytx/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_qytx/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>

sdk/jm_qytx2/res/layout-port/jmsetuser.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content_view"
     android:layout_width="@dimen/jm_login_width"
-    android:layout_height="@dimen/jm_register_height_old"
+    android:layout_height="@dimen/jm_guest_height_old"
     android:background="@drawable/jmloginb"
     android:orientation="vertical" >
 

sdk/jm_qytx2/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"
@@ -30,7 +31,7 @@
                 <ImageView
                     android:layout_width="@dimen/jm_float_icon_size"
                     android:layout_height="@dimen/jm_float_icon_size"
-                    android:src="@drawable/jm_user" />
+                    android:src="@drawable/jm_float_user" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -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"
@@ -70,7 +72,7 @@
                 <ImageView
                     android:layout_width="@dimen/jm_float_icon_size"
                     android:layout_height="@dimen/jm_float_icon_size"
-                    android:src="@drawable/jm_gift" />
+                    android:src="@drawable/jm_float_gift" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -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
@@ -107,7 +109,7 @@
             <ImageView
                 android:layout_width="@dimen/jm_float_icon_size"
                 android:layout_height="@dimen/jm_float_icon_size"
-                android:src="@drawable/jm_kefu" />
+                android:src="@drawable/jm_float_service" />
 
             <TextView
                 android:layout_width="wrap_content"

sdk/jm_qytx2/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?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:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"
@@ -110,6 +111,7 @@
                     android:imeOptions="actionNext"
                     android:inputType="phone"
                     android:maxLength="25"
+                    android:textCursorDrawable="@null"
                     android:nextFocusForward="@+id/edit_code"
                     android:singleLine="true"
                     android:textColor="#000000"
@@ -170,7 +172,8 @@
                     android:hint="@string/moblie_edit_code_hint"
                     android:imeOptions="actionDone"
                     android:inputType="number"
-                    android:maxLength="15"
+                    android:maxLength="6"
+                    android:textCursorDrawable="@null"
                     android:singleLine="true"
                     android:textColor="#000000"
                     android:textColorHint="#d5dad3"

sdk/jm_qytx2/res/layout/jmlogin_main_new.xml

@@ -103,6 +103,7 @@
                 android:imeOptions="actionNext"
                 android:inputType="phone"
                 android:maxLength="25"
+                android:textCursorDrawable="@null"
                 android:nextFocusForward="@+id/edit_code"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -136,6 +137,7 @@
                 android:hint="@string/moblie_edit_code_hint"
                 android:imeOptions="actionDone"
                 android:inputType="number"
+                android:textCursorDrawable="@null"
                 android:maxLength="6"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_qytx2/res/layout/jmnotice.xml

@@ -7,8 +7,9 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:id="@+id/content"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_qytx2/res/layout/jmsetpwd.xml

@@ -133,7 +133,7 @@
                     android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                  
+                    android:textCursorDrawable="@null"
                     android:layout_toRightOf="@+id/pwr"
                     android:background="@null"
                     android:gravity="center_vertical"

sdk/jm_qytx2/res/layout/jmsetpwd_new.xml

@@ -132,7 +132,7 @@
                     android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                  
+                    android:textCursorDrawable="@null"
                     android:layout_toRightOf="@+id/pwr"
                     android:background="@null"
                     android:gravity="center_vertical"

sdk/jm_qytx2/res/layout/jmsetuser.xml

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_height="@dimen/jm_guest_height_old"
         android:background="@drawable/jmloginb"
         android:orientation="vertical" >
 
@@ -91,6 +91,7 @@
                     android:gravity="center_vertical"
                     android:hint="@string/user_edit_hint"
                     android:inputType="text"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                     android:textColor="#000000"

sdk/jm_qytx2/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"
@@ -61,6 +62,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -93,6 +95,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_qytx2/res/layout/jmuserinfo.xml

@@ -7,8 +7,9 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:id="@+id/content"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_qytx2/res/layout/jmuserlogin.xml

@@ -1,5 +1,6 @@
 <?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:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -116,6 +117,7 @@
                         android:hint="@string/user_edit_hint"
                         android:imeOptions="actionNext"
                         android:inputType="text"
+                        android:textCursorDrawable="@null"
                         android:maxLength="22"
                         android:nextFocusForward="@+id/edit_pwd"
                         android:singleLine="true"
@@ -195,6 +197,7 @@
                     android:hint="@string/user_edit_pwdhint"
                     android:imeOptions="actionDone"
                     android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                     android:textColor="#000000"

sdk/jm_qytx2/res/layout/jmuserlogin_new.xml

@@ -104,6 +104,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -143,6 +144,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="textPassword"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_qytx2/res/layout/jmuserp.xml

@@ -7,8 +7,8 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_login_radius"
         android:background="@color/jmfont_white" >
 
@@ -19,11 +19,11 @@
 
         <ImageView
             android:id="@+id/ivback"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/jm_back" />
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:scaleType="centerInside"
+            android:src="@drawable/jm_close" />
 
         <com.jmhy.sdk.view.GifImageView
             android:id="@+id/gif"

sdk/jm_qytx2/res/layout/jmuserregister.xml

@@ -109,6 +109,7 @@
                     android:gravity="center_vertical"
                     android:hint="@string/user_edit_hint"
                     android:imeOptions="actionNext"
+                    android:textCursorDrawable="@null"
                     android:inputType="text"
                     android:maxLength="22"
                     android:nextFocusForward="@+id/edit_pwa"
@@ -178,6 +179,7 @@
                     android:hint="@string/user_edit_pwdhint"
                     android:imeOptions="actionDone"
                     android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                  

sdk/jm_qytx2/res/layout/jmuserregister_new.xml

@@ -60,6 +60,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -92,6 +93,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="textPassword"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

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

@@ -29,7 +29,7 @@
     <string name="auto_bt_msg">取消登录</string>
     <string name="toast_welcome_msg">欢迎回来，</string>
     <string name="float_user_msg">帐号</string>
-    <string name="float_gift">礼包</string>
+    <string name="float_gift">福利</string>
     <string name="float_kefu_msg">客服</string>
     <string name="http_rror_msg">网络连接失败，请检查您的网络连接！</string>
     <string name="user_hintcode_msg">请输入验证码！</string>
@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>
@@ -61,4 +61,14 @@
     <string name="jm_confirm">确定</string>
     <string name="jm_dialog_title">提示</string>
     <string name="jm_no_install_wechat">请先安装微信</string>
+    <string name="jm_agreement">我已阅读并同意《用户注册服务协议》</string>
+    <string name="jm_register_login">手机注册登录</string>
+    <string name="jm_register_email">邮箱注册登录</string>
+    <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_qytx2/res/values/jm_colors.xml

@@ -7,8 +7,20 @@
     <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>
     <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_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_qytx2/res/values/jm_dimens.xml

@@ -5,11 +5,18 @@
     <dimen name="jm_login_width">375dp</dimen>
     <dimen name="jm_login_height">315dp</dimen>
     <dimen name="jm_login_height_old">330dp</dimen>
+    <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>
@@ -28,4 +35,6 @@
     <dimen name="jm_notice_width">471dp</dimen>
     <dimen name="jm_notice_height">314dp</dimen>
     <dimen name="jm_notice_radius">8dp</dimen>
+    <dimen name="jm_pay_width">330dp</dimen>
+    <dimen name="jm_pay_height">330dp</dimen>
 </resources>

sdk/jm_qytx2/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>
@@ -61,4 +61,14 @@
     <string name="jm_confirm">确定</string>
     <string name="jm_dialog_title">提示</string>
     <string name="jm_no_install_wechat">请先安装微信</string>
+    <string name="jm_agreement">我已阅读并同意《用户注册服务协议》</string>
+    <string name="jm_register_login">手机注册登录</string>
+    <string name="jm_register_email">邮箱注册登录</string>
+    <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_test/res/layout-port/jmsetuser.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content_view"
     android:layout_width="@dimen/jm_login_width"
-    android:layout_height="@dimen/jm_register_height_old"
+    android:layout_height="@dimen/jm_guest_height_old"
     android:background="@drawable/jmloginb"
     android:orientation="vertical" >
 

sdk/jm_test/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"
@@ -30,7 +31,7 @@
                 <ImageView
                     android:layout_width="@dimen/jm_float_icon_size"
                     android:layout_height="@dimen/jm_float_icon_size"
-                    android:src="@drawable/jm_user" />
+                    android:src="@drawable/jm_float_user" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -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"
@@ -70,7 +72,7 @@
                 <ImageView
                     android:layout_width="@dimen/jm_float_icon_size"
                     android:layout_height="@dimen/jm_float_icon_size"
-                    android:src="@drawable/jm_gift" />
+                    android:src="@drawable/jm_float_gift" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -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
@@ -107,7 +109,7 @@
             <ImageView
                 android:layout_width="@dimen/jm_float_icon_size"
                 android:layout_height="@dimen/jm_float_icon_size"
-                android:src="@drawable/jm_kefu" />
+                android:src="@drawable/jm_float_service" />
 
             <TextView
                 android:layout_width="wrap_content"

sdk/jm_test/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?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:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"
@@ -110,6 +111,7 @@
                     android:imeOptions="actionNext"
                     android:inputType="phone"
                     android:maxLength="25"
+                    android:textCursorDrawable="@null"
                     android:nextFocusForward="@+id/edit_code"
                     android:singleLine="true"
                     android:textColor="#000000"
@@ -170,7 +172,8 @@
                     android:hint="@string/moblie_edit_code_hint"
                     android:imeOptions="actionDone"
                     android:inputType="number"
-                    android:maxLength="15"
+                    android:maxLength="6"
+                    android:textCursorDrawable="@null"
                     android:singleLine="true"
                     android:textColor="#000000"
                     android:textColorHint="#d5dad3"

sdk/jm_test/res/layout/jmlogin_main_new.xml

@@ -103,6 +103,7 @@
                 android:imeOptions="actionNext"
                 android:inputType="phone"
                 android:maxLength="25"
+                android:textCursorDrawable="@null"
                 android:nextFocusForward="@+id/edit_code"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -136,6 +137,7 @@
                 android:hint="@string/moblie_edit_code_hint"
                 android:imeOptions="actionDone"
                 android:inputType="number"
+                android:textCursorDrawable="@null"
                 android:maxLength="6"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_test/res/layout/jmnotice.xml

@@ -7,8 +7,9 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_notice_width"
-        android:layout_height="@dimen/jm_notice_height"
+        android:id="@+id/content"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_notice_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_test/res/layout/jmsetpwd.xml

@@ -133,7 +133,7 @@
                     android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                  
+                    android:textCursorDrawable="@null"
                     android:layout_toRightOf="@+id/pwr"
                     android:background="@null"
                     android:gravity="center_vertical"

sdk/jm_test/res/layout/jmsetpwd_new.xml

@@ -132,7 +132,7 @@
                     android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                  
+                    android:textCursorDrawable="@null"
                     android:layout_toRightOf="@+id/pwr"
                     android:background="@null"
                     android:gravity="center_vertical"

sdk/jm_test/res/layout/jmsetuser.xml

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_height="@dimen/jm_guest_height_old"
         android:background="@drawable/jmloginb"
         android:orientation="vertical" >
 
@@ -91,6 +91,7 @@
                     android:gravity="center_vertical"
                     android:hint="@string/user_edit_hint"
                     android:inputType="text"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                     android:textColor="#000000"

sdk/jm_test/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"
@@ -61,6 +62,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -93,6 +95,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_test/res/layout/jmuserinfo.xml

@@ -7,8 +7,9 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:id="@+id/content"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_webview_radius"
         android:background="@color/jmfont_white">
 

sdk/jm_test/res/layout/jmuserlogin.xml

@@ -1,5 +1,6 @@
 <?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:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -116,6 +117,7 @@
                         android:hint="@string/user_edit_hint"
                         android:imeOptions="actionNext"
                         android:inputType="text"
+                        android:textCursorDrawable="@null"
                         android:maxLength="22"
                         android:nextFocusForward="@+id/edit_pwd"
                         android:singleLine="true"
@@ -195,6 +197,7 @@
                     android:hint="@string/user_edit_pwdhint"
                     android:imeOptions="actionDone"
                     android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                     android:textColor="#000000"

sdk/jm_test/res/layout/jmuserlogin_new.xml

@@ -104,6 +104,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -143,6 +144,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="textPassword"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

sdk/jm_test/res/layout/jmuserp.xml

@@ -7,8 +7,8 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
-        android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height_old"
+        android:layout_width="@dimen/jm_pay_width"
+        android:layout_height="@dimen/jm_pay_height"
         app:jm_radius="@dimen/jm_login_radius"
         android:background="@color/jmfont_white" >
 
@@ -19,11 +19,11 @@
 
         <ImageView
             android:id="@+id/ivback"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/jm_back" />
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:scaleType="centerInside"
+            android:src="@drawable/jm_close" />
 
         <com.jmhy.sdk.view.GifImageView
             android:id="@+id/gif"

sdk/jm_test/res/layout/jmuserregister.xml

@@ -109,6 +109,7 @@
                     android:gravity="center_vertical"
                     android:hint="@string/user_edit_hint"
                     android:imeOptions="actionNext"
+                    android:textCursorDrawable="@null"
                     android:inputType="text"
                     android:maxLength="22"
                     android:nextFocusForward="@+id/edit_pwa"
@@ -178,6 +179,7 @@
                     android:hint="@string/user_edit_pwdhint"
                     android:imeOptions="actionDone"
                     android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
                     android:maxLength="22"
                     android:singleLine="true"
                  

sdk/jm_test/res/layout/jmuserregister_new.xml

@@ -60,6 +60,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_hint"
                 android:inputType="text"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"
@@ -92,6 +93,7 @@
                 android:gravity="center_vertical"
                 android:hint="@string/user_edit_pwdhint"
                 android:inputType="textPassword"
+                android:textCursorDrawable="@null"
                 android:maxLength="22"
                 android:singleLine="true"
                 android:textColor="#000000"

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

@@ -29,7 +29,7 @@
     <string name="auto_bt_msg">取消登录</string>
     <string name="toast_welcome_msg">欢迎回来，</string>
     <string name="float_user_msg">帐号</string>
-    <string name="float_gift">礼包</string>
+    <string name="float_gift">福利</string>
     <string name="float_kefu_msg">客服</string>
     <string name="http_rror_msg">网络连接失败，请检查您的网络连接！</string>
     <string name="user_hintcode_msg">请输入验证码！</string>
@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>
@@ -61,4 +61,14 @@
     <string name="jm_confirm">确定</string>
     <string name="jm_dialog_title">提示</string>
     <string name="jm_no_install_wechat">请先安装微信</string>
+    <string name="jm_agreement">我已阅读并同意《用户注册服务协议》</string>
+    <string name="jm_register_login">手机注册登录</string>
+    <string name="jm_register_email">邮箱注册登录</string>
+    <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_test/res/values/jm_colors.xml

@@ -7,8 +7,20 @@
     <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>
     <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_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_test/res/values/jm_dimens.xml

@@ -5,11 +5,18 @@
     <dimen name="jm_login_width">375dp</dimen>
     <dimen name="jm_login_height">315dp</dimen>
     <dimen name="jm_login_height_old">330dp</dimen>
+    <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>
@@ -28,4 +35,6 @@
     <dimen name="jm_notice_width">471dp</dimen>
     <dimen name="jm_notice_height">314dp</dimen>
     <dimen name="jm_notice_radius">8dp</dimen>
+    <dimen name="jm_pay_width">330dp</dimen>
+    <dimen name="jm_pay_height">330dp</dimen>
 </resources>

sdk/jm_test/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>
@@ -61,4 +61,14 @@
     <string name="jm_confirm">确定</string>
     <string name="jm_dialog_title">提示</string>
     <string name="jm_no_install_wechat">请先安装微信</string>
+    <string name="jm_agreement">我已阅读并同意《用户注册服务协议》</string>
+    <string name="jm_register_login">手机注册登录</string>
+    <string name="jm_register_email">邮箱注册登录</string>
+    <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_vivo/res/drawable/jmautologinb.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    
-     android:shape="rectangle">
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
             <!-- 填充颜色 -->
-    <solid android:color="#50000000"></solid>
+    <solid android:color="#50000000"/>
    
     <!-- 线的宽度，颜色灰色 -->
-    <stroke android:width="1dp" android:color="#50000000"></stroke>        
+    <stroke android:width="1dp" android:color="#50000000"/>
    
     <!-- 矩形的圆角半径 -->
-    <corners android:radius="5dp" />       
+    <corners android:radius="@dimen/jm_login_radius" />
 
 </shape>

sdk/jm_vivo/res/drawable/jmloginb.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    
-     android:shape="rectangle">
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
             <!-- 填充颜色 -->
-    <solid android:color="#ffffff"></solid>
-   
-    <!-- 线的宽度，颜色灰色 -->
-    <stroke android:width="1dp" android:color="#ffffff"></stroke>        
-   
+    <solid android:color="@color/jmfont_white"/>
     <!-- 矩形的圆角半径 -->
-    <corners android:radius="5dp" />       
-
+    <corners android:radius="@dimen/jm_login_radius" />
 </shape>

sdk/jm_vivo/res/layout/jm_float_view.xml

@@ -6,76 +6,143 @@
 
     <LinearLayout
         android:id="@+id/ll_menu"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="56dp"
         android:background="@drawable/jmfloat_bg"
-        android:paddingRight="12dp"
         android:gravity="center"
         android:orientation="horizontal"
+        android:paddingLeft="56dp"
+        android:paddingRight="12dp"
         android:visibility="gone"
         tools:visibility="visible">
 
-        <LinearLayout
+        <FrameLayout
             android:id="@+id/tv_account"
             android:layout_width="45dp"
             android:layout_height="45dp"
-            android:layout_marginTop="2dp"
-            android:gravity="center"
-            android:orientation="vertical" >
+            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" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_user_msg"
+                    android:textColor="@color/jmfont_blues"
+                    android:textSize="12sp" />
+            </LinearLayout>
 
             <ImageView
-                android:layout_width="@dimen/jm_float_icon_size"
-                android:layout_height="@dimen/jm_float_icon_size"
-                android:background="@drawable/jm_user" />
+                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>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/float_user_msg"
-                android:textSize="12sp"
-                android:textColor="@color/jmfont_blues" />
-        </LinearLayout>
-         <ImageView 
-             android:layout_width="2dp"
+        <ImageView
+            android:id="@+id/tv_gift_line"
+            android:layout_width="2dp"
             android:layout_height="35dp"
-            android:background="@drawable/jm_interval"
-             />
+            android:src="@drawable/jm_interval" />
+
+        <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" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_gift"
+                    android:textColor="@color/jmfont_blues"
+                    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" />
+
         <LinearLayout
             android:id="@+id/tv_kefu"
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_marginTop="2dp"
             android:gravity="center"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <ImageView
                 android:layout_width="@dimen/jm_float_icon_size"
                 android:layout_height="@dimen/jm_float_icon_size"
-                android:background="@drawable/jm_kefu" />
+                android:src="@drawable/jm_float_service" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/float_kefu_msg"
-                android:textSize="12sp"
-                android:textColor="@color/jmfont_blues" />
+                android:textColor="@color/jmfont_blues"
+                android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
         android:id="@+id/float_view"
-        android:layout_width="56dp"
+        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="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|center_vertical"
-            android:padding="2dp"
+            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>

sdk/jm_vivo/res/layout/jmautologin.xml

@@ -9,7 +9,7 @@
 
     <LinearLayout
         android:layout_width="@dimen/jm_login_width"
-        android:layout_height="@dimen/jm_login_height"
+        android:layout_height="@dimen/jm_auto_login_height"
         android:background="@drawable/jmautologinb"
         android:orientation="vertical" >
 

sdk/jm_vivo/res/layout/jmcommunity.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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" />
 
-      
-    
+        <!--<com.jmhy.sdk.view.GifImageView
+            android:id="@+id/gif"
+            android:layout_width="240dp"
+            android:layout_height="240dp"
+            android:layout_gravity="center" />-->
 
-</LinearLayout>
+</FrameLayout>

sdk/jm_vivo/res/layout/jmlogin_main.xml

@@ -1,15 +1,17 @@
 <?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:id="@+id/linear"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:background="@drawable/jmloginb">
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height_old"
-        android:background="@drawable/jmloginb"
         android:orientation="vertical" >
 
         <RelativeLayout
@@ -23,7 +25,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="15dp"
-                android:background="@drawable/jm_logo" />
+                android:src="@drawable/jm_logo" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -42,14 +44,14 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/jm_kefu" />
+                android:src="@drawable/jm_kefu" />
 
             <TextView
                 android:id="@+id/tvversion"
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"
@@ -109,6 +111,7 @@
                     android:imeOptions="actionNext"
                     android:inputType="phone"
                     android:maxLength="25"
+                    android:textCursorDrawable="@null"
                     android:nextFocusForward="@+id/edit_code"
                     android:singleLine="true"
                     android:textColor="#000000"
@@ -169,7 +172,8 @@
                     android:hint="@string/moblie_edit_code_hint"
                     android:imeOptions="actionDone"
                     android:inputType="number"
-                    android:maxLength="15"
+                    android:maxLength="6"
+                    android:textCursorDrawable="@null"
                     android:singleLine="true"
                     android:textColor="#000000"
                     android:textColorHint="#d5dad3"
@@ -178,16 +182,15 @@
 
                 <Button
                     android:id="@+id/ibcode"
-                    android:layout_width="70dp"
+                    android:layout_width="74dp"
                     android:layout_height="35dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerHorizontal="true"
                     android:layout_margin="5dp"
                     android:background="@drawable/jm_blues_codebtn_style"
-                    android:padding="5sp"
                     android:text="@string/moblie_bt_code"
                     android:textColor="@color/jmfont_white"
-                    android:textSize="11sp" />
+                    android:textSize="10sp" />
             </RelativeLayout>
 
             <View
@@ -243,7 +246,7 @@
                     android:paddingRight="20dp"
                     android:text="@string/moblie_bt_user"
                     android:textColor="@color/jmfont_blues"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
 
                 <Button
                     android:id="@+id/mobilebt"
@@ -254,7 +257,7 @@
                     android:padding="5sp"
                     android:text="@string/moblie_bt_login"
                     android:textColor="@color/jmfont_white"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -273,7 +276,7 @@
                     android:padding="5sp"
                     android:text="@string/moblie_text_visitor"
                     android:textColor="@color/jmfont_gray"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
 
                 <TextView
                     android:id="@+id/ivregister"
@@ -284,7 +287,7 @@
                     android:padding="5sp"
                     android:text="@string/moblie_text_register"
                     android:textColor="@color/jmfont_gray"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
             </RelativeLayout>
         </LinearLayout>
     </LinearLayout>