更新所有sdk

sdk/jm/libs/config.json

@@ -5,6 +5,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190911.jar"
+		"jm_sdk_20190912.jar"
 	]
 }

sdk/jm_beiyu/libs/config.json

@@ -0,0 +1,22 @@
+{
+	"default":[
+		"alipaysdk.jar",
+		"alipaysecsdk.jar",
+		"alipayutdid.jar",
+		"any_sdk_anycommon.jar",
+		"beiyu_any_sdk_core.jar",
+		"beiyu_sdk_core_v1.3.5_20180823.jar",
+		"beiyu_sdk_ui.jar",
+		"gson-2.3.1.jar",
+		"okhttp-3.4.1.jar",
+		"okio-1.9.0.jar",
+		"picasso-2.5.2.jar",
+		"wftsdk2.0.jar",
+		"android-support-v4.jar",
+		"commons-httpclient-3.1.jar",
+		"org.apache.http.legacy.jar",
+		"walle.jar",
+		"walle-reader-1.1.6.jar",
+		"jm_sdk_20190912.jar"
+	]
+}

sdk/jm_beiyu/manifest.xml

@@ -15,7 +15,6 @@
 		<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 		<uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD" />
 		<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-		<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 	</permissions>
 
     <application>

sdk/jm_beiyu/res/drawable/jm_agree_button_4.xml

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

sdk/jm_beiyu/res/drawable/jm_auto_login_bg_4.xml

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

sdk/jm_beiyu/res/drawable/jm_button_cancel_4.xml

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

sdk/jm_beiyu/res/drawable/jm_button_getcode_4.xml

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

sdk/jm_beiyu/res/drawable/jm_button_login_4.xml

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

sdk/jm_beiyu/res/drawable/jm_button_register_4.xml

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

sdk/jm_beiyu/res/drawable/jm_button_setpass_4.xml

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

sdk/jm_beiyu/res/drawable/jm_green_codebtn_style.xml

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

sdk/jm_beiyu/res/drawable/jm_green_light_codebtn_style.xml

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

sdk/jm_beiyu/res/drawable/jm_input_layout_bg_4.xml

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

sdk/jm_beiyu/res/drawable/jm_login_bg_4.xml

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

sdk/jm_beiyu/res/drawable/jm_orange_codebtn_style.xml

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

sdk/jm_beiyu/res/drawable/jm_skin3_bg.xml

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

sdk/jm_beiyu/res/drawable/jm_skin3_input_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent"/>
+    <stroke android:color="@color/jm_dialog_line" android:width="1px"/>
+</shape>

sdk/jm_beiyu/res/drawable/jm_skin3_select_left_checked.xml

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

sdk/jm_beiyu/res/drawable/jm_skin3_select_left_normal.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="@color/jm_green" android:width="1dp"/>
+    <corners android:bottomLeftRadius="5dp" android:topLeftRadius="5dp"/>
+</shape>

sdk/jm_beiyu/res/drawable/jm_skin3_select_right_checked.xml

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

sdk/jm_beiyu/res/drawable/jm_skin3_select_right_normal.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="@color/jm_green" android:width="1dp"/>
+    <corners android:topRightRadius="5dp" android:bottomRightRadius="5dp"/>
+</shape>

sdk/jm_beiyu/res/drawable/jmfloat_bg_4.xml

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

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

@@ -30,7 +30,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"
@@ -70,7 +70,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"
@@ -107,7 +107,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_beiyu/res/layout/jm_float_view_4.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="56dp">
+
+    <LinearLayout
+        android:id="@+id/ll_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="56dp"
+        android:paddingLeft="56dp"
+        android:background="@drawable/jmfloat_bg_4"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingRight="12dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <FrameLayout
+            android:id="@+id/tv_account"
+            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_user_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_user_msg"
+                    android:textColor="@color/jm_float_text_4"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <ImageView
+                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>
+
+        <View
+            android:id="@+id/tv_gift_line"
+            android:layout_width="2dp"
+            android:layout_height="35dp"
+            android:background="@color/jm_float_text_4" />
+
+        <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_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_gift"
+                    android:textColor="@color/jm_float_text_4"
+                    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>
+
+        <View
+            android:id="@+id/tv_kefu_line"
+            android:layout_width="2dp"
+            android:layout_height="35dp"
+            android:background="@color/jm_float_text_4" />
+
+        <LinearLayout
+            android:id="@+id/tv_kefu"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="2dp"
+            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_service_4" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/float_kefu_msg"
+                android:textColor="@color/jm_float_text_4"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/float_view"
+        android:layout_width="30dp"
+        android:layout_height="56dp"
+        android:padding="2dp"
+        tools:visibility="gone">
+        <ImageView
+            android:id="@+id/float_view_icon_imageView"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_gravity="start|center_vertical"
+            android:scaleType="fitStart"
+            android:src="@drawable/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_jq/res/layout/jmautologin_p.xml → sdk/jm_beiyu/res/layout/jmautologin_3.xml

@@ -4,20 +4,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
-        android:layout_width="340dp"
-        android:layout_height="360dp"
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
         android:background="@drawable/jmautologinb"
         android:orientation="vertical" >
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
-            android:background="@drawable/jm_auto_logo" />
+            android:background="@drawable/jm_logo_3" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -35,7 +36,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
             android:padding="5sp"
-            android:text="m123456789"
+            tools:text="m123456789"
             android:id="@+id/tvusername"
             android:textColor="@color/jmfont_white"
             android:textSize="22sp" />
@@ -50,16 +51,17 @@
             android:textColor="@color/jmfont_white"
             android:textSize="16sp" />
 
-        <Button
-           
+        <TextView
             android:layout_width="180dp"
             android:layout_height="45dp"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/jm_backlogin_btn"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:background="@drawable/jm_green_codebtn_style"
             android:text="@string/auto_bt_msg"
-            android:textColor="@color/jmfont_blues"
+            android:textColor="@color/jmfont_white"
             android:id="@+id/btbacklogin"
+            android:textAllCaps="false"
             android:textSize="18sp" />
     </LinearLayout>
 

sdk/jm_beiyu/res/layout/jmautologin_4.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+            <ImageView
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/jm_logo_4" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/auto_text_msg"
+                android:textColor="@color/jmfont_white"
+                android:textSize="17sp" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="27dp"
+            tools:text="m123456789"
+            android:id="@+id/tvusername"
+            android:textColor="@color/jm_yellow"
+            android:textSize="17sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="44dp"
+            android:text="@string/auto_text_tip"
+            android:textColor="@color/jmfont_white"
+            android:textSize="8sp" />
+
+        <TextView
+            android:layout_width="133dp"
+            android:layout_height="33dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:gravity="center"
+            android:background="@drawable/jm_button_cancel_4"
+            android:text="@string/auto_bt_msg"
+            android:textColor="@color/jmfont_white"
+            android:id="@+id/btbacklogin"
+            android:textAllCaps="false"
+            android:textSize="11sp" />
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmexitdialog_3.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="320dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center"
+        android:background="@drawable/jmdialog"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="@string/exit_title"
+            android:textColor="@color/jmfont_black"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="30dp"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/dialog_cancel"
+                android:layout_width="140dp"
+                android:layout_height="35dp"
+                android:textAllCaps="false"
+                android:background="@drawable/jm_green_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_no"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+
+            <Button
+                android:id="@+id/dialog_exit"
+                android:layout_width="140dp"
+                android:layout_height="35dp"
+                android:layout_marginLeft="15dp"
+                android:textAllCaps="false"
+                android:background="@drawable/jm_green_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmexitdialog_4.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="320dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="@string/exit_title"
+            android:textColor="@color/jm_yellow"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="30dp"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/dialog_cancel"
+                android:layout_width="140dp"
+                android:layout_height="35dp"
+                android:textAllCaps="false"
+                android:background="@drawable/jm_button_login_4"
+                android:gravity="center"
+                android:text="@string/exit_no"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+
+            <Button
+                android:id="@+id/dialog_exit"
+                android:layout_width="140dp"
+                android:layout_height="35dp"
+                android:layout_marginLeft="15dp"
+                android:textAllCaps="false"
+                android:background="@drawable/jm_button_register_4"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmlogin_main.xml

@@ -110,6 +110,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 +171,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_beiyu/res/layout/jmlogin_main_3.xml

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_skin3_bg"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/jm_logo_3" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/userlgbt"
+                    android:layout_width="@dimen/jm_login_switch_width"
+                    android:layout_height="@dimen/jm_login_switch_height"
+                    android:gravity="center"
+                    android:textColor="@color/jmfont_black"
+                    android:text="@string/moblie_bt_user"
+                    android:textSize="12sp"
+                    android:background="@drawable/jm_skin3_select_left_normal"/>
+
+                <TextView
+                    android:layout_width="@dimen/jm_login_switch_width"
+                    android:layout_height="@dimen/jm_login_switch_height"
+                    android:gravity="center"
+                    android:textColor="@color/jmfont_black"
+                    android:text="@string/moblie_login_title"
+                    android:textSize="12sp"
+                    android:background="@drawable/jm_skin3_select_right_checked"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_new" />
+
+                <TextView
+                    android:id="@+id/tvversion"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="v1.0.1"
+                    android:textColor="#d5dad3"
+                    android:textSize="10sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:background="@drawable/jm_skin3_input_bg">
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_msg"/>
+
+            <EditText
+                android:id="@+id/edit_iphone"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:background="@null"
+                android:gravity="center_vertical"
+                android:hint="@string/moblie_edit_hint"
+                android:imeOptions="actionNext"
+                android:inputType="phone"
+                android:maxLength="25"
+                android:textCursorDrawable="@null"
+                android:nextFocusForward="@+id/edit_code"
+                android:singleLine="true"
+                android:textColor="#000000"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:gravity="center_vertical"
+            android:layout_height="@dimen/jm_input_height"
+            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/jm_skin3_input_bg">
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/moblie_text_msg"/>
+
+            <EditText
+                android:id="@+id/edit_code"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="35dp"
+                android:background="@null"
+                android:gravity="center_vertical"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" >
+            </EditText>
+
+            <TextView
+                android:id="@+id/ibcode"
+                android:layout_width="75dp"
+                android:layout_height="34dp"
+                android:layout_margin="6dp"
+                android:gravity="center"
+                android:background="@drawable/jm_green_codebtn_style"
+                android:padding="5sp"
+                android:text="@string/moblie_bt_code"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/mobilebt"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:layout_marginTop="@dimen/jm_login_submit_margin_top"
+            android:gravity="center"
+            android:background="@drawable/jm_green_codebtn_style"
+            android:text="@string/moblie_bt_login"
+            android:textColor="@color/jmfont_white"
+            android:textSize="18sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:id="@+id/tvvistor"
+                android:text="@string/moblie_text_visitor"
+                android:textColor="@color/jm_green"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/ivregister"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="@string/moblie_text_register"
+                android:textColor="@color/jm_green"
+                android:textSize="16sp" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmlogin_main_4.xml

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width_4"
+        android:layout_height="@dimen/jm_login_height_4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_4"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_4"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_4" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/line"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp"
+                android:text="@string/jm_register_login"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_kefu_msg"
+                    android:textColor="#d5dad3"
+                    android:textSize="11sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/jm_input_layout_bg_4">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_phone_4"/>
+
+                <EditText
+                    android:id="@+id/edit_iphone"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/moblie_edit_hint"
+                    android:inputType="number"
+                    android:maxLength="11"
+                    android:singleLine="true"
+                    android:textCursorDrawable="@null"
+                    android:nextFocusDown="@+id/edit_code"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_code_4"/>
+
+                <EditText
+                    android:id="@+id/edit_code"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/moblie_edit_code_hint"
+                    android:inputType="number"
+                    android:maxLength="6"
+                    android:singleLine="true"
+                    android:textCursorDrawable="@null"
+                    android:imeOptions="actionDone"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+
+                <Button
+                    android:id="@+id/ibcode"
+                    android:layout_width="100dp"
+                    android:layout_height="33dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginRight="16dp"
+                    android:background="@drawable/jm_button_getcode_4"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jm_yellow"
+                    android:textSize="13sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                android:id="@+id/agree"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:button="@drawable/jm_agree_button_4"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jm_yellow"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/userlgbt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:background="@drawable/jm_button_register_4">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_button_account_4"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/moblie_bt_user"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/mobilebt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:layout_gravity="end"
+                android:gravity="center"
+                android:background="@drawable/jm_button_login_4"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmlogin_main_5.xml

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width_4"
+        android:layout_height="@dimen/jm_login_height_4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_4"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_4"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_4" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/line"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp"
+                android:text="@string/jm_register_email"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_kefu_msg"
+                    android:textColor="#d5dad3"
+                    android:textSize="11sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/jm_input_layout_bg_4">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_email_5"/>
+
+                <EditText
+                    android:id="@+id/edit_iphone"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/email_edit_hint"
+                    android:inputType="textEmailAddress"
+                    android:textCursorDrawable="@null"
+                    android:nextFocusDown="@+id/edit_code"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_password_4"/>
+
+                <EditText
+                    android:id="@+id/edit_password"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_pwdhint"
+                    android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:imeOptions="actionDone"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                android:id="@+id/agree"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:button="@drawable/jm_agree_button_4"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jm_yellow"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/userlgbt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:background="@drawable/jm_button_register_4">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_button_account_4"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/moblie_bt_user"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/mobilebt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:layout_gravity="end"
+                android:gravity="center"
+                android:background="@drawable/jm_button_login_4"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
+        android:id="@+id/content"
         android:layout_width="@dimen/jm_notice_width"
         android:layout_height="@dimen/jm_notice_height"
         app:jm_radius="@dimen/jm_notice_radius"

sdk/jm_beiyu/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_jq/res/layout/jmsetuser_p.xml → sdk/jm_beiyu/res/layout/jmsetpwd_3.xml

@@ -7,9 +7,9 @@
     android:orientation="vertical" >
 
     <LinearLayout
-        android:layout_width="340dp"
-        android:layout_height="360dp"
-        android:background="@drawable/jmloginb"
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
+        android:background="@drawable/jm_skin3_bg"
         android:orientation="vertical" >
 
         <RelativeLayout
@@ -19,12 +19,12 @@
 
             <ImageView
                 android:id="@+id/logo"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="15dp"
-                android:background="@drawable/jm_logo" />
+                android:background="@drawable/jm_logo_3" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -32,12 +32,12 @@
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
                 android:layout_margin="5dp"
+                android:layout_marginRight="25dp"
                 android:layout_marginTop="10dp"
-                android:layout_toRightOf="@+id/logo"
                 android:padding="5sp"
-                android:text="@string/setuser_text_title"
+                android:text="@string/setpwd_text_title"
                 android:textColor="@color/jmfont_black"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
         </RelativeLayout>
 
         <LinearLayout
@@ -52,50 +52,27 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp" >
 
-                <RelativeLayout
-                    android:id="@+id/iphoe_bg"
-                    android:layout_width="60dp"
-                    android:layout_height="35dp"
-                    android:layout_margin="5dp" >
-
-                    <TextView
-                        android:id="@+id/usertv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="@string/user_text_msg"
-                        android:textColor="@color/jmfont_black"
-                        android:textSize="18sp" />
-
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@+id/usertv"
-                        android:background="@drawable/jm_userl" />
-                </RelativeLayout>
+                <TextView
+                    android:id="@+id/usertv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_centerVertical="true"
+                    android:text="@string/user_text_msg"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="18sp" />
 
-                <EditText
-                    android:id="@+id/edit_user"
-                    android:layout_width="match_parent"
-                    android:layout_height="35dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_centerHorizontal="true"
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="15dp"
-                    android:layout_toRightOf="@+id/iphoe_bg"
-                    android:background="@null"
-                    android:enabled="false"
-                    android:gravity="center_vertical"
-                    android:hint="@string/user_edit_hint"
-                    android:inputType="text"
-                    android:maxLength="22"
-                    android:singleLine="true"
-                    android:textColor="#000000"
-                    android:textColorHint="#d5dad3"
-                    android:textSize="16sp" >
-                </EditText>
+                    android:layout_toRightOf="@+id/usertv"
+                    android:text="16889014567"
+                    android:id="@+id/tvmobile"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="18sp" >
+                </TextView>
             </RelativeLayout>
 
             <View
@@ -120,38 +97,24 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp" >
 
-                <RelativeLayout
+                <TextView
                     android:id="@+id/pwr"
-                    android:layout_width="60dp"
-                    android:layout_height="35dp"
-                    android:layout_margin="5dp" >
-
-                    <TextView
-                        android:id="@+id/pwdtv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="@string/user_text_pwd"
-                        android:textColor="@color/jmfont_black"
-                        android:textSize="18sp" />
-
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@+id/pwdtv"
-                        android:background="@drawable/jm_pwd" />
-                </RelativeLayout>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_centerVertical="true"
+                    android:text="@string/user_text_pwd"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="18sp" />
 
                 <EditText
                     android:id="@+id/edit_pwd"
-                     android:enabled="false"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="15dp"
+                    android:textCursorDrawable="@null"
                     android:layout_toRightOf="@+id/pwr"
                     android:background="@null"
                     android:gravity="center_vertical"
@@ -161,6 +124,7 @@
                     android:singleLine="true"
                     android:textColor="#000000"
                     android:textColorHint="#d5dad3"
+                    android:imeOptions="actionDone"
                     android:textSize="16sp" >
                 </EditText>
             </RelativeLayout>
@@ -180,36 +144,19 @@
             android:layout_gravity="center"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:orientation="vertical" >
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="@string/setuser_text_tip"
-                    android:visibility="invisible"
-                    android:textColor="@color/jmfont_red"
-                    android:id="@+id/tvmsg"
-                    android:textSize="18sp" />
-            </LinearLayout>
-
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp" >
+                android:layout_marginTop="20dp" >
 
                 <Button
-                    android:id="@+id/btgetgame"
+                    android:id="@+id/iphonebtlg"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
-                    android:background="@drawable/jmblues_btn_style"
+                    android:background="@drawable/jm_green_codebtn_style"
                     android:text="@string/setuser_bt_msg"
                     android:textColor="@color/jmfont_white" />
             </RelativeLayout>

sdk/jm_beiyu/res/layout/jmsetpwd_4.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/content_view"
+        android:layout_width="@dimen/jm_login_width_4"
+        android:layout_height="@dimen/jm_login_height_4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_4"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_4"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_4" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/line"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp"
+                android:text="@string/setpwd_text_title"/>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/jm_input_layout_bg_4">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_password_4"/>
+
+                <EditText
+                    android:id="@+id/edit_pwd"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_pwdhint"
+                    android:inputType="textPassword"
+                    android:nextFocusDown="@+id/edit_pwd_2"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textCursorDrawable="@null"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+
+                <ImageView
+                    android:id="@+id/eye_1"
+                    android:layout_width="@dimen/jm_input_icon"
+                    android:layout_height="@dimen/jm_input_icon"
+                    android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_eye_close_4" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_password_4"/>
+
+                <EditText
+                    android:id="@+id/edit_pwd_2"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/jm_password_again"
+                    android:inputType="textPassword"
+                    android:textCursorDrawable="@null"
+                    android:imeOptions="actionDone"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+
+                <ImageView
+                    android:id="@+id/eye_2"
+                    android:layout_width="@dimen/jm_input_icon"
+                    android:layout_height="@dimen/jm_input_icon"
+                    android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_eye_close_4" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/iphonebtlg"
+            android:layout_width="133dp"
+            android:layout_height="33dp"
+            android:layout_marginTop="29dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:background="@drawable/jm_button_setpass_4"
+            android:text="@string/moblie_bt_login"
+            android:textColor="@color/jmfont_white"
+            android:textSize="11sp" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_skin3_bg"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/jm_logo_3" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_black"
+                android:text="@string/setuser_text_title"
+                android:textSize="16sp"/>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_msg"/>
+
+            <EditText
+                android:id="@+id/edit_user"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:background="@null"
+                android:enabled="false"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_pwd"/>
+
+            <EditText
+                android:id="@+id/edit_pwd"
+                android:enabled="false"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:background="@null"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" >
+            </EditText>
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/btgetgame"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginTop="@dimen/jm_login_submit_margin_top"
+                android:gravity="center"
+                android:background="@drawable/jm_green_codebtn_style"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:text="@string/setuser_text_tip"
+                android:textColor="@color/jmfont_red"
+                android:id="@+id/tvmsg"
+                android:textSize="14sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmsetuser_new.xml

@@ -61,6 +61,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 +94,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_beiyu/res/layout/jmuserinfo.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <com.jmhy.sdk.view.CornerCompatView
+        android:id="@+id/content"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height_old"
         app:jm_radius="@dimen/jm_webview_radius"

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

@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_skin3_bg"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_3" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="@dimen/jm_login_switch_width"
+                    android:layout_height="@dimen/jm_login_switch_height"
+                    android:gravity="center"
+                    android:textColor="@color/jmfont_black"
+                    android:text="@string/moblie_bt_user"
+                    android:textSize="12sp"
+                    android:background="@drawable/jm_skin3_select_left_checked"/>
+
+                <TextView
+                    android:id="@+id/iphonebtlg"
+                    android:layout_width="@dimen/jm_login_switch_width"
+                    android:layout_height="@dimen/jm_login_switch_height"
+                    android:gravity="center"
+                    android:textColor="@color/jmfont_black"
+                    android:text="@string/moblie_login_title"
+                    android:textSize="12sp"
+                    android:background="@drawable/jm_skin3_select_right_normal"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_new" />
+
+                <TextView
+                    android:id="@+id/tvversion"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="v1.0.1"
+                    android:textColor="#d5dad3"
+                    android:textSize="10sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_msg"/>
+
+            <EditText
+                android:id="@+id/edit_user"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="35dp"
+                android:background="@null"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:id="@+id/ibpulldown"
+                android:layout_width="@dimen/jm_input_icon"
+                android:layout_height="@dimen/jm_input_icon"
+                android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                android:scaleType="centerInside"
+                android:src="@drawable/jm_iphone" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_pwd"/>
+
+            <EditText
+                android:id="@+id/edit_pwd"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:background="@null"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/userloginbt"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginTop="@dimen/jm_login_submit_margin_top"
+                android:gravity="center"
+                android:background="@drawable/jm_green_codebtn_style"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tvforgot"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:text="@string/user_forgot_msg"
+                android:textColor="@color/jm_green"
+                android:textSize="16sp" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/ivregister"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:background="@drawable/jm_orange_codebtn_style"
+            android:text="@string/moblie_text_register"
+            android:textColor="@color/jmfont_white"
+            android:textSize="18sp" />
+    </LinearLayout>
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmuserlogin_4.xml

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width_4"
+        android:layout_height="@dimen/jm_login_height_4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_4"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_4"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_4" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/line"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp"
+                android:text="@string/moblie_bt_user"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_kefu_msg"
+                    android:textColor="#d5dad3"
+                    android:textSize="11sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/jm_input_layout_bg_4">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_account_4"/>
+
+                <EditText
+                    android:id="@+id/edit_user"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_hint"
+                    android:inputType="text"
+                    android:nextFocusDown="@+id/edit_pwd"
+                    android:maxLength="22"
+                    android:textCursorDrawable="@null"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+
+                <ImageView
+                    android:id="@+id/ibpulldown"
+                    android:layout_width="@dimen/jm_input_icon"
+                    android:layout_height="@dimen/jm_input_icon"
+                    android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_urpulldown_new" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_password_4"/>
+
+                <EditText
+                    android:id="@+id/edit_pwd"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_pwdhint"
+                    android:inputType="textPassword"
+                    android:imeOptions="actionDone"
+                    android:textCursorDrawable="@null"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tvforgot"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:text="@string/user_forgot_msg"
+                android:textColor="@color/jm_yellow"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/ivregister"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:background="@drawable/jm_button_register_4">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_button_phone_4"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_register_login"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/userloginbt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:layout_gravity="end"
+                android:gravity="center"
+                android:background="@drawable/jm_button_login_4"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

sdk/jm_beiyu/res/layout/jmuserlogin_5.xml

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width_4"
+        android:layout_height="@dimen/jm_login_height_4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_4"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_4"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_4" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/line"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp"
+                android:text="@string/moblie_bt_user"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+                <ImageView
+                    android:id="@+id/ivkefu"
+                    android:layout_width="26dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_kefu_4" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/float_kefu_msg"
+                    android:textColor="#d5dad3"
+                    android:textSize="11sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/jm_input_layout_bg_4">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_account_4"/>
+
+                <EditText
+                    android:id="@+id/edit_user"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_hint"
+                    android:inputType="text"
+                    android:nextFocusDown="@+id/edit_pwd"
+                    android:textCursorDrawable="@null"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+
+                <ImageView
+                    android:id="@+id/ibpulldown"
+                    android:layout_width="@dimen/jm_input_icon"
+                    android:layout_height="@dimen/jm_input_icon"
+                    android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_urpulldown_new" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="7dp"
+                android:layout_marginRight="7dp"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/jm_password_4"/>
+
+                <EditText
+                    android:id="@+id/edit_pwd"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="35dp"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_pwdhint"
+                    android:inputType="textPassword"
+                    android:imeOptions="actionDone"
+                    android:textCursorDrawable="@null"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:textSize="11sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tvforgot"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:text="@string/user_forgot_msg"
+                android:textColor="@color/jm_yellow"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/ivregister"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:background="@drawable/jm_button_register_4">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_button_email_5"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_register_email"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/userloginbt"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:layout_gravity="end"
+                android:gravity="center"
+                android:background="@drawable/jm_button_login_4"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="11sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="@dimen/jm_login_width"
+        android:layout_height="@dimen/jm_login_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_skin3_bg"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/jm_login_logo_height"
+                android:layout_height="@dimen/jm_login_logo_height"
+                android:layout_centerVertical="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/jm_logo_3" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/jmfont_black"
+                android:text="@string/moblie_text_register"
+                android:textSize="16sp"/>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_msg"/>
+
+            <EditText
+                android:id="@+id/edit_usera"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:background="@null"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_input_height"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/jm_skin3_input_bg">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textColor="@color/jmfont_gray"
+                android:textSize="16sp"
+                android:text="@string/user_text_pwd"/>
+
+            <EditText
+                android:id="@+id/edit_pwa"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="35dp"
+                android:background="@null"
+                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"
+                android:textColorHint="#d5dad3"
+                android:textSize="16sp" >
+            </EditText>
+
+            <ImageView
+                android:id="@+id/eye"
+                android:layout_width="@dimen/jm_input_icon"
+                android:layout_height="@dimen/jm_input_icon"
+                android:layout_marginRight="@dimen/jm_input_icon_margin_right"
+                android:scaleType="centerInside"
+                android:src="@drawable/jm_eye_close" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/btsubmit"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:layout_marginTop="@dimen/jm_login_submit_margin_top"
+                android:gravity="center"
+                android:background="@drawable/jm_green_codebtn_style"
+                android:text="@string/moblie_bt_login"
+                android:textColor="@color/jmfont_white"
+                android:textSize="18sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_marginTop="@dimen/jm_forget_text_margin_top"
+                android:orientation="horizontal" >
+
+                <CheckBox
+                    android:id="@+id/remembpwcb"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:button="@drawable/jmagreeradio"
+                    android:background="@null"
+                    android:checked="true"
+                    android:enabled="false" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/user_text_my"
+                    android:textColor="@color/jmfont_gray"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tvurl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/user_text_deal"
+                    android:textColor="@color/jm_green"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/user_text_end"
+                    android:textColor="@color/jmfont_gray"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp">
+            <TextView
+                android:id="@+id/ivdirect"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/user_bt_login"
+                android:textColor="@color/jm_green"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/ivvisitor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/moblie_text_visitor"
+                android:textColor="@color/jm_green"
+                android:textSize="16sp" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>

sdk/jm_beiyu/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_beiyu/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>
@@ -61,4 +61,10 @@
     <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>
 </resources>

sdk/jm_beiyu/res/values/jm_colors.xml

@@ -11,4 +11,12 @@
     <color name="jm_exit_dialog_bg">#94000000</color>
     <color name="jm_dialog_line">#999999</color>
     <color name="jm_transparent">@android:color/transparent</color>
+    <color name="jm_green">#2EBB45</color>
+    <color name="jm_green_light">#78D159</color>
+    <color name="jm_orange">#F88520</color>
+    <color name="jm_yellow">#FEDD21</color>
+    <color name="jm_auto_login_bg_4">#B2140C08</color>
+    <color name="jm_login_bg_4">#504A4A</color>
+    <color name="jm_input_layout_bg_4">#EBEBEB</color>
+    <color name="jm_float_text_4">#FFF9C8</color>
 </resources>

sdk/jm_beiyu/res/values/jm_dimens.xml

@@ -5,11 +5,15 @@
     <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_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_submit_margin_top">45dp</dimen>
     <dimen name="jm_forget_text_margin_top">12dp</dimen>
     <dimen name="jm_login_logo_width">30dp</dimen>
@@ -28,4 +32,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_beiyu/res/values/jm_strings.xml

@@ -61,4 +61,10 @@
     <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>
 </resources>

sdk/jm_cangyu/libs/config.json

@@ -0,0 +1,12 @@
+{
+	"default":[
+		"cy_pro_3.6.jar",
+		"android-support-v4.jar",
+		"commons-httpclient-3.1.jar",
+		"org.apache.http.legacy.jar",
+		"walle.jar",
+		"walle-reader-1.1.6.jar",
+		"jm_sdk_20190912.jar"
+		
+	]
+}