Browse Source

全渠道更新sdk1.3.3

zqbo 5 years ago
parent
commit
525a567d67
100 changed files with 2388 additions and 0 deletions
  1. BIN
      sdk/jm_beiyu/libs/jm_sdk_20191225.jar
  2. BIN
      sdk/jm_beiyu/res/drawable-hdpi/jm_check6.png
  3. BIN
      sdk/jm_beiyu/res/drawable-hdpi/jm_close6.png
  4. BIN
      sdk/jm_beiyu/res/drawable-hdpi/jm_kefu6.png
  5. BIN
      sdk/jm_beiyu/res/drawable-hdpi/jm_protocol6.png
  6. BIN
      sdk/jm_beiyu/res/drawable-hdpi/jm_unckeck6.png
  7. 9 0
      sdk/jm_beiyu/res/drawable/jm_agree_button_6.xml
  8. 5 0
      sdk/jm_beiyu/res/drawable/jm_button_getcode_6.xml
  9. 5 0
      sdk/jm_beiyu/res/drawable/jm_button_nextstep_6.xml
  10. 5 0
      sdk/jm_beiyu/res/drawable/jm_login_bg_6.xml
  11. 6 0
      sdk/jm_beiyu/res/drawable/jm_phone_input_6.xml
  12. 5 0
      sdk/jm_beiyu/res/drawable/jm_red_codebtn_style.xml
  13. 5 0
      sdk/jm_beiyu/res/drawable/jm_red_light_codebtn_style.xml
  14. 84 0
      sdk/jm_beiyu/res/layout/jmautologin_6.xml
  15. 57 0
      sdk/jm_beiyu/res/layout/jmexitdialog_6.xml
  16. 217 0
      sdk/jm_beiyu/res/layout/jmlogin_main_6.xml
  17. BIN
      sdk/jm_cangyu/libs/jm_sdk_20191225.jar
  18. BIN
      sdk/jm_cangyu/res/drawable-hdpi/jm_check6.png
  19. BIN
      sdk/jm_cangyu/res/drawable-hdpi/jm_close6.png
  20. BIN
      sdk/jm_cangyu/res/drawable-hdpi/jm_kefu6.png
  21. BIN
      sdk/jm_cangyu/res/drawable-hdpi/jm_protocol6.png
  22. BIN
      sdk/jm_cangyu/res/drawable-hdpi/jm_unckeck6.png
  23. 9 0
      sdk/jm_cangyu/res/drawable/jm_agree_button_6.xml
  24. 5 0
      sdk/jm_cangyu/res/drawable/jm_button_getcode_6.xml
  25. 5 0
      sdk/jm_cangyu/res/drawable/jm_button_nextstep_6.xml
  26. 5 0
      sdk/jm_cangyu/res/drawable/jm_login_bg_6.xml
  27. 6 0
      sdk/jm_cangyu/res/drawable/jm_phone_input_6.xml
  28. 5 0
      sdk/jm_cangyu/res/drawable/jm_red_codebtn_style.xml
  29. 5 0
      sdk/jm_cangyu/res/drawable/jm_red_light_codebtn_style.xml
  30. 84 0
      sdk/jm_cangyu/res/layout/jmautologin_6.xml
  31. 57 0
      sdk/jm_cangyu/res/layout/jmexitdialog_6.xml
  32. 217 0
      sdk/jm_cangyu/res/layout/jmlogin_main_6.xml
  33. BIN
      sdk/jm_jq/libs/jm_sdk_20191225.jar
  34. BIN
      sdk/jm_jq/res/drawable-hdpi/jm_check6.png
  35. BIN
      sdk/jm_jq/res/drawable-hdpi/jm_close6.png
  36. BIN
      sdk/jm_jq/res/drawable-hdpi/jm_kefu6.png
  37. BIN
      sdk/jm_jq/res/drawable-hdpi/jm_protocol6.png
  38. BIN
      sdk/jm_jq/res/drawable-hdpi/jm_unckeck6.png
  39. 9 0
      sdk/jm_jq/res/drawable/jm_agree_button_6.xml
  40. 5 0
      sdk/jm_jq/res/drawable/jm_button_getcode_6.xml
  41. 5 0
      sdk/jm_jq/res/drawable/jm_button_nextstep_6.xml
  42. 5 0
      sdk/jm_jq/res/drawable/jm_login_bg_6.xml
  43. 6 0
      sdk/jm_jq/res/drawable/jm_phone_input_6.xml
  44. 5 0
      sdk/jm_jq/res/drawable/jm_red_codebtn_style.xml
  45. 5 0
      sdk/jm_jq/res/drawable/jm_red_light_codebtn_style.xml
  46. 84 0
      sdk/jm_jq/res/layout/jmautologin_6.xml
  47. 57 0
      sdk/jm_jq/res/layout/jmexitdialog_6.xml
  48. 217 0
      sdk/jm_jq/res/layout/jmlogin_main_6.xml
  49. BIN
      sdk/jm_oppo/libs/jm_sdk_20191225.jar
  50. BIN
      sdk/jm_oppo/libs/jm_sdk_nopay_20191225.jar
  51. BIN
      sdk/jm_oppo/res/drawable-hdpi/jm_check6.png
  52. BIN
      sdk/jm_oppo/res/drawable-hdpi/jm_close6.png
  53. BIN
      sdk/jm_oppo/res/drawable-hdpi/jm_kefu6.png
  54. BIN
      sdk/jm_oppo/res/drawable-hdpi/jm_protocol6.png
  55. BIN
      sdk/jm_oppo/res/drawable-hdpi/jm_unckeck6.png
  56. 9 0
      sdk/jm_oppo/res/drawable/jm_agree_button_6.xml
  57. 5 0
      sdk/jm_oppo/res/drawable/jm_button_getcode_6.xml
  58. 5 0
      sdk/jm_oppo/res/drawable/jm_button_nextstep_6.xml
  59. 5 0
      sdk/jm_oppo/res/drawable/jm_login_bg_6.xml
  60. 6 0
      sdk/jm_oppo/res/drawable/jm_phone_input_6.xml
  61. 5 0
      sdk/jm_oppo/res/drawable/jm_red_codebtn_style.xml
  62. 5 0
      sdk/jm_oppo/res/drawable/jm_red_light_codebtn_style.xml
  63. 84 0
      sdk/jm_oppo/res/layout/jmautologin_6.xml
  64. 57 0
      sdk/jm_oppo/res/layout/jmexitdialog_6.xml
  65. 217 0
      sdk/jm_oppo/res/layout/jmlogin_main_6.xml
  66. BIN
      sdk/jm_quick/libs/jm_sdk_20191225.jar
  67. BIN
      sdk/jm_quick/res/drawable-hdpi/jm_check6.png
  68. BIN
      sdk/jm_quick/res/drawable-hdpi/jm_close6.png
  69. BIN
      sdk/jm_quick/res/drawable-hdpi/jm_kefu6.png
  70. BIN
      sdk/jm_quick/res/drawable-hdpi/jm_protocol6.png
  71. BIN
      sdk/jm_quick/res/drawable-hdpi/jm_unckeck6.png
  72. 9 0
      sdk/jm_quick/res/drawable/jm_agree_button_6.xml
  73. 5 0
      sdk/jm_quick/res/drawable/jm_button_getcode_6.xml
  74. 5 0
      sdk/jm_quick/res/drawable/jm_button_nextstep_6.xml
  75. 5 0
      sdk/jm_quick/res/drawable/jm_login_bg_6.xml
  76. 6 0
      sdk/jm_quick/res/drawable/jm_phone_input_6.xml
  77. 5 0
      sdk/jm_quick/res/drawable/jm_red_codebtn_style.xml
  78. 5 0
      sdk/jm_quick/res/drawable/jm_red_light_codebtn_style.xml
  79. 84 0
      sdk/jm_quick/res/layout/jmautologin_6.xml
  80. 57 0
      sdk/jm_quick/res/layout/jmexitdialog_6.xml
  81. 217 0
      sdk/jm_quick/res/layout/jmlogin_main_6.xml
  82. BIN
      sdk/jm_qytx/libs/jm_sdk_20191225.jar
  83. BIN
      sdk/jm_qytx/libs/jm_sdk_nopay_20191225.jar
  84. BIN
      sdk/jm_qytx/res/drawable-hdpi/jm_check6.png
  85. BIN
      sdk/jm_qytx/res/drawable-hdpi/jm_close6.png
  86. BIN
      sdk/jm_qytx/res/drawable-hdpi/jm_kefu6.png
  87. BIN
      sdk/jm_qytx/res/drawable-hdpi/jm_protocol6.png
  88. BIN
      sdk/jm_qytx/res/drawable-hdpi/jm_unckeck6.png
  89. 9 0
      sdk/jm_qytx/res/drawable/jm_agree_button_6.xml
  90. 5 0
      sdk/jm_qytx/res/drawable/jm_button_getcode_6.xml
  91. 5 0
      sdk/jm_qytx/res/drawable/jm_button_nextstep_6.xml
  92. 5 0
      sdk/jm_qytx/res/drawable/jm_login_bg_6.xml
  93. 6 0
      sdk/jm_qytx/res/drawable/jm_phone_input_6.xml
  94. 5 0
      sdk/jm_qytx/res/drawable/jm_red_codebtn_style.xml
  95. 5 0
      sdk/jm_qytx/res/drawable/jm_red_light_codebtn_style.xml
  96. 84 0
      sdk/jm_qytx/res/layout/jmautologin_6.xml
  97. 57 0
      sdk/jm_qytx/res/layout/jmexitdialog_6.xml
  98. 217 0
      sdk/jm_qytx/res/layout/jmlogin_main_6.xml
  99. BIN
      sdk/jm_qytx2/res/drawable-hdpi/jm_account_4.png
  100. BIN
      sdk/jm_qytx2/res/drawable-hdpi/jm_agree_4.png

BIN
sdk/jm_beiyu/libs/jm_sdk_20191225.jar


BIN
sdk/jm_beiyu/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_beiyu/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_beiyu/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_beiyu/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_beiyu/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_beiyu/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_beiyu/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_beiyu/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_beiyu/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_beiyu/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_beiyu/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_beiyu/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_beiyu/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_beiyu/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_beiyu/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_cangyu/libs/jm_sdk_20191225.jar


BIN
sdk/jm_cangyu/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_cangyu/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_cangyu/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_cangyu/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_cangyu/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_cangyu/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_cangyu/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_cangyu/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_cangyu/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_cangyu/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_cangyu/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_cangyu/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_cangyu/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_cangyu/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_cangyu/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_jq/libs/jm_sdk_20191225.jar


BIN
sdk/jm_jq/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_jq/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_jq/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_jq/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_jq/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_jq/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_jq/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_jq/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_jq/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_jq/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_jq/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_jq/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_jq/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_jq/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_jq/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_oppo/libs/jm_sdk_20191225.jar


BIN
sdk/jm_oppo/libs/jm_sdk_nopay_20191108.jar → sdk/jm_oppo/libs/jm_sdk_nopay_20191225.jar


BIN
sdk/jm_oppo/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_oppo/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_oppo/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_oppo/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_oppo/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_oppo/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_oppo/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_oppo/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_oppo/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_oppo/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_oppo/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_oppo/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_oppo/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_oppo/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_oppo/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_quick/libs/jm_sdk_20191225.jar


BIN
sdk/jm_quick/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_quick/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_quick/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_quick/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_quick/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_quick/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_quick/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_quick/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_quick/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_quick/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_quick/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_quick/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_quick/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_quick/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_quick/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_qytx/libs/jm_sdk_20191225.jar


BIN
sdk/jm_qytx/libs/jm_sdk_nopay_20191108.jar → sdk/jm_qytx/libs/jm_sdk_nopay_20191225.jar


BIN
sdk/jm_qytx/res/drawable-hdpi/jm_check6.png


BIN
sdk/jm_qytx/res/drawable-hdpi/jm_close6.png


BIN
sdk/jm_qytx/res/drawable-hdpi/jm_kefu6.png


BIN
sdk/jm_qytx/res/drawable-hdpi/jm_protocol6.png


BIN
sdk/jm_qytx/res/drawable-hdpi/jm_unckeck6.png


+ 9 - 0
sdk/jm_qytx/res/drawable/jm_agree_button_6.xml

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

+ 5 - 0
sdk/jm_qytx/res/drawable/jm_button_getcode_6.xml

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

+ 5 - 0
sdk/jm_qytx/res/drawable/jm_button_nextstep_6.xml

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

+ 5 - 0
sdk/jm_qytx/res/drawable/jm_login_bg_6.xml

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

+ 6 - 0
sdk/jm_qytx/res/drawable/jm_phone_input_6.xml

@@ -0,0 +1,6 @@
+<?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"/>
+    <stroke android:color="@color/jm_input_bg_6" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
sdk/jm_qytx/res/drawable/jm_red_codebtn_style.xml

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

+ 5 - 0
sdk/jm_qytx/res/drawable/jm_red_light_codebtn_style.xml

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

+ 84 - 0
sdk/jm_qytx/res/layout/jmautologin_6.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateTint="@color/jmbtn6_red"
+            android:indeterminateOnly="true" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="333dp"
+        android:layout_height="200dp"
+        android:background="@drawable/jm_auto_login_bg_4"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <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>
+
+</FrameLayout>

+ 57 - 0
sdk/jm_qytx/res/layout/jmexitdialog_6.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_red_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_red_light_codebtn_style"
+                android:gravity="center"
+                android:text="@string/exit_yes"
+                android:textColor="@color/jmfont_white"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 217 - 0
sdk/jm_qytx/res/layout/jmlogin_main_6.xml

@@ -0,0 +1,217 @@
+<?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_6"
+        android:layout_height="@dimen/jm_login_height_6"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:background="@drawable/jm_login_bg_6"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/jm_login_top_height_6"
+            android:orientation="vertical" >
+
+            <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/colsebtn"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/jm_close6" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/jm_input_height"
+                android:gravity="center_vertical"
+                android:background="@drawable/jm_phone_input_6"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    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_6"
+                    android:text="@string/moblie_bt_code"
+                    android:textColor="@color/jmfont_white"
+                    android:textSize="13sp" />
+            </LinearLayout>
+
+            <!--<LinearLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/jm_input_height"-->
+                <!--android:gravity="center_vertical"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:orientation="horizontal">-->
+                <!--<TextView-->
+                    <!--android:id="@+id/ibcode"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:text="@string/jm_next_step"-->
+                    <!--android:gravity="center"-->
+                    <!--android:textColor="@color/jmfont_white"-->
+                    <!--android:textSize="15sp"-->
+                    <!--android:background="@drawable/jm_button_nextstep_6"/>-->
+            <!--</LinearLayout>-->
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <RadioButton
+                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_6"
+                android:paddingLeft="4dp"
+                android:checked="true"
+                android:text="@string/jm_agreement"
+                android:textColor="@color/jmfont_black"
+                android:textSize="11sp" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/agree"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_protocol6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_user_protocol"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+            <View
+                android:id="@+id/line"
+                android:layout_width="1dp"
+                android:layout_height="15dp"
+                android:layout_toRightOf="@id/logo"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_centerVertical="true"
+                android:background="@color/jm_dialog_line"/>
+
+            <LinearLayout
+                android:id="@+id/ivkefu"
+                android:layout_width="113dp"
+                android:layout_height="33dp"
+                android:orientation="horizontal"
+                android:layout_gravity="end"
+                android:gravity="center"
+                >
+                <ImageView
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:layout_marginRight="5dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/jm_kefu6"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/jm_contact_kefu"
+                    android:textColor="@color/jmfont_black"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

BIN
sdk/jm_qytx2/res/drawable-hdpi/jm_account_4.png


BIN
sdk/jm_qytx2/res/drawable-hdpi/jm_agree_4.png


Some files were not shown because too many files changed in this diff