增加皮肤3

接口host改为从配置读取

package_utils.py

@@ -1028,7 +1028,7 @@ def addChannel(game, sdk, subChannel, config):
     if 'appkey' in properties:
         appkey = properties['appkey']
 
-    return file_utils.execJarCmd(walle, 'put -e version=%s,agent=%s,appid=%s,appkey=%s "%s" "%s"' % (config_utils.getDate(), properties['agent'], appid, appkey, signedApk, signedApk))
+    return file_utils.execJarCmd(walle, 'put -e version=%s,agent=%s,appid=%s,appkey=%s,host=%s "%s" "%s"' % (config_utils.getDate(), properties['agent'], appid, appkey, properties['host'], signedApk, signedApk))
 
 def clearTemp(game, sdk, subChannel, config):
     '''

sdk/jm/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/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/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/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/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/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/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/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/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/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/res/layout/jmautologin_3.xml

@@ -0,0 +1,68 @@
+<?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:background="@drawable/jmautologinb"
+        android:orientation="vertical" >
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/jm_logo_3" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:padding="5sp"
+            android:text="@string/auto_text_msg"
+            android:textColor="@color/jmfont_white"
+            android:textSize="22sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:padding="5sp"
+            tools:text="m123456789"
+            android:id="@+id/tvusername"
+            android:textColor="@color/jmfont_white"
+            android:textSize="22sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:padding="5sp"
+            android:text="@string/auto_text_tip"
+            android:textColor="@color/jmfont_white"
+            android:textSize="16sp" />
+
+        <TextView
+            android:layout_width="180dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:background="@drawable/jm_green_codebtn_style"
+            android:text="@string/auto_bt_msg"
+            android:textColor="@color/jmfont_white"
+            android:id="@+id/btbacklogin"
+            android:textAllCaps="false"
+            android:textSize="18sp" />
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm/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/res/layout/jmlogin_main_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"
+    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: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: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/res/layout/jmsetpwd_3.xml

@@ -0,0 +1,166 @@
+<?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:background="@drawable/jm_skin3_bg"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            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:layout_marginLeft="25dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/jm_logo_3" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="5dp"
+                android:layout_marginRight="25dp"
+                android:layout_marginTop="10dp"
+                android:padding="5sp"
+                android:text="@string/setpwd_text_title"
+                android:textColor="@color/jmfont_black"
+                android:textSize="20sp" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="40dp" >
+
+                <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" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toRightOf="@+id/usertv"
+                    android:text="16889014567"
+                    android:id="@+id/tvmobile"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="18sp" >
+                </TextView>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:alpha="0.5"
+                android:background="#d6d6d6" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="40dp" >
+
+                <TextView
+                    android:id="@+id/pwr"
+                    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:layout_width="match_parent"
+                    android:layout_height="35dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_centerHorizontal="true"
+                  
+                    android:layout_toRightOf="@+id/pwr"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="@string/user_edit_pwdhint"
+                    android:inputType="text"
+                    android:maxLength="22"
+                    android:singleLine="true"
+                    android:textColor="#000000"
+                    android:textColorHint="#d5dad3"
+                    android:imeOptions="actionDone"
+                    android:textSize="16sp" >
+                </EditText>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:alpha="0.5"
+                android:background="#d6d6d6" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="5dp"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp" >
+
+                <Button
+                    android:id="@+id/iphonebtlg"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/jm_green_codebtn_style"
+                    android:text="@string/setuser_bt_msg"
+                    android:textColor="@color/jmfont_white" />
+            </RelativeLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

sdk/jm/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" >
 

sdk/jm/res/layout/jmsetuser_3.xml

@@ -0,0 +1,130 @@
+<?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: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: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/res/layout/jmuserlogin_3.xml

@@ -0,0 +1,189 @@
+<?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: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: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/res/layout/jmuserregister_3.xml

@@ -0,0 +1,193 @@
+<?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: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: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/res/values/jm_colors.xml

@@ -11,4 +11,8 @@
     <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>
+
 </resources>

sdk/jm/res/values/jm_dimens.xml

@@ -5,6 +5,7 @@
     <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_register_height_old">314dp</dimen>
     <dimen name="jm_guest_height_old">287dp</dimen>
     <dimen name="jm_auto_login_height">300dp</dimen>

sdk/jm/res/values/jm_public.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <public name="jm_radius" type="attr" id="0x7f010000"/>
+</resources>