Browse Source

更新遥望

zqbo 5 years ago
parent
commit
2fc8fc8b3b
100 changed files with 240 additions and 102 deletions
  1. BIN
      sdk/jm_yaodian/jm_yaodian.jar
  2. 1 4
      sdk/jm_yaodian/libs/config.json
  3. BIN
      sdk/jm_yaodian/libs/walle-reader-1.1.6.jar
  4. BIN
      sdk/jm_yaodian/libs/walle.jar
  5. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_account.png
  6. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_account_4.png
  7. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_agree.png
  8. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_agree_4.png
  9. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_agree_on.png
  10. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_agree_on_4.png
  11. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_auto_logo.png
  12. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_back.png
  13. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_button_account_4.png
  14. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_button_email_5.png
  15. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_button_phone_4.png
  16. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_cancel.png
  17. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_close.png
  18. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_code.png
  19. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_code_4.png
  20. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_cut.png
  21. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_email_5.png
  22. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_eye_close.png
  23. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_eye_close_4.png
  24. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_eye_open.png
  25. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_eye_open_4.png
  26. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float.png
  27. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_3.png
  28. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_4.png
  29. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_gift.png
  30. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_gift_4.png
  31. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_move.png
  32. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_move_3.png
  33. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_move_new.png
  34. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_new.png
  35. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_on.png
  36. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_3.png
  37. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_4.png
  38. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_new.png
  39. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_service.png
  40. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_service_4.png
  41. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_user.png
  42. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_float_user_4.png
  43. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_gift.png
  44. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_interval.png
  45. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_iphone.png
  46. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_kefu.png
  47. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_kefu_4.png
  48. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_kefu_new.png
  49. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_login_bg.png
  50. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_logo.png
  51. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_logo_3.png
  52. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_logo_4.png
  53. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_logo_new.png
  54. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_password.png
  55. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_password_4.png
  56. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_phone.png
  57. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_phone_4.png
  58. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_pwd.png
  59. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_toast.png
  60. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_urpulldown.png
  61. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_urpulldown_new.png
  62. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_urpullup_new.png
  63. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_user.png
  64. BIN
      sdk/jm_yaodian/res/drawable-hdpi/jm_userl.png
  65. 9 0
      sdk/jm_yaodian/res/drawable/jm_agree_button_4.xml
  66. 5 0
      sdk/jm_yaodian/res/drawable/jm_auto_login_bg_4.xml
  67. 19 11
      sdk/jm_yaodian/res/drawable/jm_backlogin_btn.xml
  68. 11 12
      sdk/jm_yaodian/res/drawable/jm_blues_codebtn_style.xml
  69. 11 12
      sdk/jm_yaodian/res/drawable/jm_blues_codebtn_style_new.xml
  70. 5 0
      sdk/jm_yaodian/res/drawable/jm_button_cancel_4.xml
  71. 5 0
      sdk/jm_yaodian/res/drawable/jm_button_getcode_4.xml
  72. 5 0
      sdk/jm_yaodian/res/drawable/jm_button_login_4.xml
  73. 5 0
      sdk/jm_yaodian/res/drawable/jm_button_register_4.xml
  74. 5 0
      sdk/jm_yaodian/res/drawable/jm_button_setpass_4.xml
  75. 20 12
      sdk/jm_yaodian/res/drawable/jm_cut_btn.xml
  76. 5 0
      sdk/jm_yaodian/res/drawable/jm_dialog_ios_bg.xml
  77. 5 0
      sdk/jm_yaodian/res/drawable/jm_exit_dialog_bg.xml
  78. 4 0
      sdk/jm_yaodian/res/drawable/jm_green_codebtn_style.xml
  79. 4 0
      sdk/jm_yaodian/res/drawable/jm_green_light_codebtn_style.xml
  80. 3 4
      sdk/jm_yaodian/res/drawable/jm_input_bg.xml
  81. 5 0
      sdk/jm_yaodian/res/drawable/jm_input_layout_bg_4.xml
  82. 5 0
      sdk/jm_yaodian/res/drawable/jm_login_bg_4.xml
  83. 5 0
      sdk/jm_yaodian/res/drawable/jm_message_tip.xml
  84. 4 0
      sdk/jm_yaodian/res/drawable/jm_orange_codebtn_style.xml
  85. 3 4
      sdk/jm_yaodian/res/drawable/jm_select_left_checked.xml
  86. 3 4
      sdk/jm_yaodian/res/drawable/jm_select_left_normal.xml
  87. 3 4
      sdk/jm_yaodian/res/drawable/jm_select_right_checked.xml
  88. 3 4
      sdk/jm_yaodian/res/drawable/jm_select_right_normal.xml
  89. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_bg.xml
  90. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_input_bg.xml
  91. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_select_left_checked.xml
  92. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_select_left_normal.xml
  93. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_select_right_checked.xml
  94. 5 0
      sdk/jm_yaodian/res/drawable/jm_skin3_select_right_normal.xml
  95. 9 6
      sdk/jm_yaodian/res/drawable/jmagreeradio.xml
  96. 11 5
      sdk/jm_yaodian/res/drawable/jmautologinb.xml
  97. 8 9
      sdk/jm_yaodian/res/drawable/jmblues_btn_style.xml
  98. 6 5
      sdk/jm_yaodian/res/drawable/jmdialog.xml
  99. 16 6
      sdk/jm_yaodian/res/drawable/jmfloat_bg.xml
  100. 7 0
      sdk/jm_yaodian/res/drawable/jmfloat_bg_4.xml

BIN
sdk/jm_yaodian/jm_yaodian.jar


+ 1 - 4
sdk/jm_yaodian/libs/config.json

@@ -1,12 +1,9 @@
 {
 	"default":[
-		"YSDK_Android_1.4.5_1078.jar",
-		"ysdk_hackdex.jar",
+		"yodsdk_v2.4.2.jar",
 		"android-support-v4.jar",
 		"commons-httpclient-3.1.jar",
 		"org.apache.http.legacy.jar",
-		"walle.jar",
-		"walle-reader-1.1.6.jar",
 		"jm_sdk_20191108.jar"
 	]
 }

BIN
sdk/jm_yaodian/libs/walle-reader-1.1.6.jar


BIN
sdk/jm_yaodian/libs/walle.jar


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_account.png


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


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_agree.png


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


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_agree_on.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_agree_on_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_auto_logo.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_back.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_button_account_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_button_email_5.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_button_phone_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_cancel.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_close.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_code.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_code_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_cut.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_email_5.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_eye_close.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_eye_close_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_eye_open.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_eye_open_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_3.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_gift.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_gift_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_move.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_move_3.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_move_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_on.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_3.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_on_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_service.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_service_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_user.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_float_user_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_gift.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_interval.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_iphone.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_kefu.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_kefu_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_kefu_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_login_bg.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_logo.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_logo_3.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_logo_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_logo_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_password.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_password_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_phone.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_phone_4.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_pwd.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_toast.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_urpulldown.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_urpulldown_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_urpullup_new.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_user.png


BIN
sdk/jm_yaodian/res/drawable-hdpi/jm_userl.png


+ 9 - 0
sdk/jm_yaodian/res/drawable/jm_agree_button_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_auto_login_bg_4.xml

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

+ 19 - 11
sdk/jm_yaodian/res/drawable/jm_backlogin_btn.xml

@@ -1,25 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item android:state_focused="true">
+    <item android:state_focused="true">  <!-- 焦点 -->
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item>
+    <item > <!-- 无焦点 -->
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
             <gradient android:startColor="#50000000" android:endColor="#50000000" android:angle="270.0" />
         </shape>
     </item>
-</selector>
+</selector>

+ 11 - 12
sdk/jm_yaodian/res/drawable/jm_blues_codebtn_style.xml

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="15.0dip" android:topRightRadius="15.0dip" android:bottomLeftRadius="15.0dip" android:bottomRightRadius="15.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item android:state_focused="true">
+    <item android:state_focused="true">  <!-- 焦点 -->
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="15.0dip" android:topRightRadius="15.0dip" android:bottomLeftRadius="15.0dip" android:bottomRightRadius="15.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item>
+    <item > <!-- 无焦点 -->
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="15.0dip" android:topRightRadius="15.0dip" android:bottomLeftRadius="15.0dip" android:bottomRightRadius="15.0dip" />
-            <gradient android:startColor="#ff2abfff" android:endColor="#ff2abfff" android:angle="270.0" />
+            <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+            <gradient android:startColor="#2abfff" android:endColor="#2abfff" android:angle="270.0" />
         </shape>
     </item>
-</selector>
+</selector>

+ 11 - 12
sdk/jm_yaodian/res/drawable/jm_blues_codebtn_style_new.xml

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="5.0dip" android:topRightRadius="5.0dip" android:bottomLeftRadius="5.0dip" android:bottomRightRadius="5.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item android:state_focused="true">
+    <item android:state_focused="true">  <!-- 焦点 -->
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="5.0dip" android:topRightRadius="5.0dip" android:bottomLeftRadius="5.0dip" android:bottomRightRadius="5.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item>
+    <item > <!-- 无焦点 -->
         <shape android:shape="rectangle">
-            <corners android:topLeftRadius="5.0dip" android:topRightRadius="5.0dip" android:bottomLeftRadius="5.0dip" android:bottomRightRadius="5.0dip" />
-            <gradient android:startColor="#ff2abfff" android:endColor="#ff2abfff" android:angle="270.0" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
+            <gradient android:startColor="#2abfff" android:endColor="#2abfff" android:angle="270.0" />
         </shape>
     </item>
-</selector>
+</selector>

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_button_cancel_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_button_getcode_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_button_login_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_button_register_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_button_setpass_4.xml

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

+ 20 - 12
sdk/jm_yaodian/res/drawable/jm_cut_btn.xml

@@ -1,25 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item android:state_focused="true">
+    <item android:state_focused="true">  <!-- 焦点 -->
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item>
+    <item > <!-- 无焦点 -->
         <shape android:shape="rectangle">
-            <stroke android:width="1.0dip" android:color="#ff2abfff" />
+            <stroke
+                android:width="1dp"
+                android:color="#2abfff" />
+            
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffffffff" android:endColor="#ffffffff" android:angle="270.0" />
+            <gradient android:startColor="#ffffff" android:endColor="#ffffff" android:angle="270.0" />
         </shape>
     </item>
-</selector>
+</selector>

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_dialog_ios_bg.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_exit_dialog_bg.xml

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

+ 4 - 0
sdk/jm_yaodian/res/drawable/jm_green_codebtn_style.xml

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

+ 4 - 0
sdk/jm_yaodian/res/drawable/jm_green_light_codebtn_style.xml

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

+ 3 - 4
sdk/jm_yaodian/res/drawable/jm_input_bg.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1.0dip" android:color="@color/jmfont_blues" />
-    <corners android:radius="5.0dip" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="@color/jmfont_blues" android:width="1dp"/>
+    <corners android:radius="5dp"/>
 </shape>

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_input_layout_bg_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_login_bg_4.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_message_tip.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/jmfont_red"/>
+    <size android:width="@dimen/jm_float_tip_size" android:height="@dimen/jm_float_tip_size"/>
+</shape>

+ 4 - 0
sdk/jm_yaodian/res/drawable/jm_orange_codebtn_style.xml

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

+ 3 - 4
sdk/jm_yaodian/res/drawable/jm_select_left_checked.xml

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

+ 3 - 4
sdk/jm_yaodian/res/drawable/jm_select_left_normal.xml

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

+ 3 - 4
sdk/jm_yaodian/res/drawable/jm_select_right_checked.xml

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

+ 3 - 4
sdk/jm_yaodian/res/drawable/jm_select_right_normal.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_bg.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_input_bg.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_select_left_checked.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_select_left_normal.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_select_right_checked.xml

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

+ 5 - 0
sdk/jm_yaodian/res/drawable/jm_skin3_select_right_normal.xml

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

+ 9 - 6
sdk/jm_yaodian/res/drawable/jmagreeradio.xml

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

+ 11 - 5
sdk/jm_yaodian/res/drawable/jmautologinb.xml

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

+ 8 - 9
sdk/jm_yaodian/res/drawable/jmblues_btn_style.xml

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+            <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item android:state_focused="true">
+    <item android:state_focused="true">  <!-- 焦点 -->
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ffd6d6d6" android:endColor="#ffd6d6d6" android:angle="270.0" />
+             <gradient android:startColor="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
         </shape>
     </item>
-    <item>
+    <item > <!-- 无焦点 -->
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
-            <gradient android:startColor="#ff2abfff" android:endColor="#ff2abfff" android:angle="270.0" />
+            <gradient android:startColor="#2abfff" android:endColor="#2abfff" android:angle="270.0" />
         </shape>
     </item>
-</selector>
+</selector>

+ 6 - 5
sdk/jm_yaodian/res/drawable/jmdialog.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    
     <corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" android:bottomLeftRadius="4.0dip" android:bottomRightRadius="4.0dip" />
-    <gradient android:startColor="#fffefefe" android:endColor="#fff5f5f5" android:angle="270.0" />
-    <stroke android:width="0.5dip" android:color="#ffa0a0a0" />
-</shape>
+    <gradient android:startColor="#fefefe" android:endColor="#F5F5F5" android:angle="270.0" />
+    <stroke android:width="0.5dip" android:color="#a0a0a0" />
+
+</shape>

+ 16 - 6
sdk/jm_yaodian/res/drawable/jmfloat_bg.xml

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <stroke android:width="0.5dip" android:color="@color/jmfont_blues" />
-            <solid android:color="#ffffffff" />
-            <corners android:topLeftRadius="25.0dip" android:topRightRadius="25.0dip" android:bottomLeftRadius="25.0dip" android:bottomRightRadius="25.0dip" />
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/jmfont_blues" />
+
+            <solid android:color="#ffffff" />
+
+            <corners
+                android:topRightRadius="25dp"
+                android:topLeftRadius="25dp"
+                android:bottomRightRadius="25dp"
+                android:bottomLeftRadius="25dp"
+                />
+            
         </shape>
     </item>
-</selector>
+
+</selector>

+ 7 - 0
sdk/jm_yaodian/res/drawable/jmfloat_bg_4.xml

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

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