소스 검색

增加替换Jar和Res脚本

zqbo 5 년 전
부모
커밋
079cc5ff88
100개의 변경된 파일413개의 추가작업 그리고 0개의 파일을 삭제
  1. 154 0
      ReplaceJar&Res.py
  2. BIN
      currentSdk/jm_sdk_20191225.jar
  3. BIN
      currentSdk/res/drawable-hdpi/jm_account.png
  4. BIN
      currentSdk/res/drawable-hdpi/jm_account_4.png
  5. BIN
      currentSdk/res/drawable-hdpi/jm_agree.png
  6. BIN
      currentSdk/res/drawable-hdpi/jm_agree_4.png
  7. BIN
      currentSdk/res/drawable-hdpi/jm_agree_on.png
  8. BIN
      currentSdk/res/drawable-hdpi/jm_agree_on_4.png
  9. BIN
      currentSdk/res/drawable-hdpi/jm_auto_logo.png
  10. BIN
      currentSdk/res/drawable-hdpi/jm_back.png
  11. BIN
      currentSdk/res/drawable-hdpi/jm_button_account_4.png
  12. BIN
      currentSdk/res/drawable-hdpi/jm_button_email_5.png
  13. BIN
      currentSdk/res/drawable-hdpi/jm_button_phone_4.png
  14. BIN
      currentSdk/res/drawable-hdpi/jm_cancel.png
  15. BIN
      currentSdk/res/drawable-hdpi/jm_check6.png
  16. BIN
      currentSdk/res/drawable-hdpi/jm_close.png
  17. BIN
      currentSdk/res/drawable-hdpi/jm_close6.png
  18. BIN
      currentSdk/res/drawable-hdpi/jm_code.png
  19. BIN
      currentSdk/res/drawable-hdpi/jm_code_4.png
  20. BIN
      currentSdk/res/drawable-hdpi/jm_cut.png
  21. BIN
      currentSdk/res/drawable-hdpi/jm_email_5.png
  22. BIN
      currentSdk/res/drawable-hdpi/jm_eye_close.png
  23. BIN
      currentSdk/res/drawable-hdpi/jm_eye_close_4.png
  24. BIN
      currentSdk/res/drawable-hdpi/jm_eye_open.png
  25. BIN
      currentSdk/res/drawable-hdpi/jm_eye_open_4.png
  26. BIN
      currentSdk/res/drawable-hdpi/jm_float.png
  27. BIN
      currentSdk/res/drawable-hdpi/jm_float_3.png
  28. BIN
      currentSdk/res/drawable-hdpi/jm_float_4.png
  29. BIN
      currentSdk/res/drawable-hdpi/jm_float_gift.png
  30. BIN
      currentSdk/res/drawable-hdpi/jm_float_gift_4.png
  31. BIN
      currentSdk/res/drawable-hdpi/jm_float_move.png
  32. BIN
      currentSdk/res/drawable-hdpi/jm_float_move_3.png
  33. BIN
      currentSdk/res/drawable-hdpi/jm_float_move_new.png
  34. BIN
      currentSdk/res/drawable-hdpi/jm_float_new.png
  35. BIN
      currentSdk/res/drawable-hdpi/jm_float_on.png
  36. BIN
      currentSdk/res/drawable-hdpi/jm_float_on_3.png
  37. BIN
      currentSdk/res/drawable-hdpi/jm_float_on_4.png
  38. BIN
      currentSdk/res/drawable-hdpi/jm_float_on_new.png
  39. BIN
      currentSdk/res/drawable-hdpi/jm_float_service.png
  40. BIN
      currentSdk/res/drawable-hdpi/jm_float_service_4.png
  41. BIN
      currentSdk/res/drawable-hdpi/jm_float_user.png
  42. BIN
      currentSdk/res/drawable-hdpi/jm_float_user_4.png
  43. BIN
      currentSdk/res/drawable-hdpi/jm_gift.png
  44. BIN
      currentSdk/res/drawable-hdpi/jm_interval.png
  45. BIN
      currentSdk/res/drawable-hdpi/jm_iphone.png
  46. BIN
      currentSdk/res/drawable-hdpi/jm_kefu.png
  47. BIN
      currentSdk/res/drawable-hdpi/jm_kefu6.png
  48. BIN
      currentSdk/res/drawable-hdpi/jm_kefu_4.png
  49. BIN
      currentSdk/res/drawable-hdpi/jm_kefu_new.png
  50. BIN
      currentSdk/res/drawable-hdpi/jm_login_bg.png
  51. BIN
      currentSdk/res/drawable-hdpi/jm_logo.png
  52. BIN
      currentSdk/res/drawable-hdpi/jm_logo_3.png
  53. BIN
      currentSdk/res/drawable-hdpi/jm_logo_4.png
  54. BIN
      currentSdk/res/drawable-hdpi/jm_logo_new.png
  55. BIN
      currentSdk/res/drawable-hdpi/jm_password.png
  56. BIN
      currentSdk/res/drawable-hdpi/jm_password_4.png
  57. BIN
      currentSdk/res/drawable-hdpi/jm_phone.png
  58. BIN
      currentSdk/res/drawable-hdpi/jm_phone_4.png
  59. BIN
      currentSdk/res/drawable-hdpi/jm_protocol6.png
  60. BIN
      currentSdk/res/drawable-hdpi/jm_pwd.png
  61. BIN
      currentSdk/res/drawable-hdpi/jm_toast.png
  62. BIN
      currentSdk/res/drawable-hdpi/jm_unckeck6.png
  63. BIN
      currentSdk/res/drawable-hdpi/jm_urpulldown.png
  64. BIN
      currentSdk/res/drawable-hdpi/jm_urpulldown_new.png
  65. BIN
      currentSdk/res/drawable-hdpi/jm_urpullup_new.png
  66. BIN
      currentSdk/res/drawable-hdpi/jm_user.png
  67. BIN
      currentSdk/res/drawable-hdpi/jm_userl.png
  68. 9 0
      currentSdk/res/drawable/jm_agree_button_4.xml
  69. 9 0
      currentSdk/res/drawable/jm_agree_button_6.xml
  70. 5 0
      currentSdk/res/drawable/jm_auto_login_bg_4.xml
  71. 33 0
      currentSdk/res/drawable/jm_backlogin_btn.xml
  72. 21 0
      currentSdk/res/drawable/jm_blues_codebtn_style.xml
  73. 21 0
      currentSdk/res/drawable/jm_blues_codebtn_style_new.xml
  74. 5 0
      currentSdk/res/drawable/jm_button_cancel_4.xml
  75. 5 0
      currentSdk/res/drawable/jm_button_getcode_4.xml
  76. 5 0
      currentSdk/res/drawable/jm_button_getcode_6.xml
  77. 5 0
      currentSdk/res/drawable/jm_button_login_4.xml
  78. 5 0
      currentSdk/res/drawable/jm_button_nextstep_6.xml
  79. 5 0
      currentSdk/res/drawable/jm_button_register_4.xml
  80. 5 0
      currentSdk/res/drawable/jm_button_setpass_4.xml
  81. 33 0
      currentSdk/res/drawable/jm_cut_btn.xml
  82. 5 0
      currentSdk/res/drawable/jm_dialog_ios_bg.xml
  83. 5 0
      currentSdk/res/drawable/jm_exit_dialog_bg.xml
  84. 4 0
      currentSdk/res/drawable/jm_green_codebtn_style.xml
  85. 4 0
      currentSdk/res/drawable/jm_green_light_codebtn_style.xml
  86. 5 0
      currentSdk/res/drawable/jm_input_bg.xml
  87. 5 0
      currentSdk/res/drawable/jm_input_layout_bg_4.xml
  88. 5 0
      currentSdk/res/drawable/jm_login_bg_4.xml
  89. 5 0
      currentSdk/res/drawable/jm_login_bg_6.xml
  90. 5 0
      currentSdk/res/drawable/jm_message_tip.xml
  91. 4 0
      currentSdk/res/drawable/jm_orange_codebtn_style.xml
  92. 6 0
      currentSdk/res/drawable/jm_phone_input_6.xml
  93. 5 0
      currentSdk/res/drawable/jm_red_codebtn_style.xml
  94. 5 0
      currentSdk/res/drawable/jm_red_light_codebtn_style.xml
  95. 5 0
      currentSdk/res/drawable/jm_select_left_checked.xml
  96. 5 0
      currentSdk/res/drawable/jm_select_left_normal.xml
  97. 5 0
      currentSdk/res/drawable/jm_select_right_checked.xml
  98. 5 0
      currentSdk/res/drawable/jm_select_right_normal.xml
  99. 5 0
      currentSdk/res/drawable/jm_skin3_bg.xml
  100. 5 0
      currentSdk/res/drawable/jm_skin3_input_bg.xml

+ 154 - 0
ReplaceJar&Res.py

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

BIN
currentSdk/jm_sdk_20191225.jar


BIN
currentSdk/res/drawable-hdpi/jm_account.png


BIN
currentSdk/res/drawable-hdpi/jm_account_4.png


BIN
currentSdk/res/drawable-hdpi/jm_agree.png


BIN
currentSdk/res/drawable-hdpi/jm_agree_4.png


BIN
currentSdk/res/drawable-hdpi/jm_agree_on.png


BIN
currentSdk/res/drawable-hdpi/jm_agree_on_4.png


BIN
currentSdk/res/drawable-hdpi/jm_auto_logo.png


BIN
currentSdk/res/drawable-hdpi/jm_back.png


BIN
currentSdk/res/drawable-hdpi/jm_button_account_4.png


BIN
currentSdk/res/drawable-hdpi/jm_button_email_5.png


BIN
currentSdk/res/drawable-hdpi/jm_button_phone_4.png


BIN
currentSdk/res/drawable-hdpi/jm_cancel.png


BIN
currentSdk/res/drawable-hdpi/jm_check6.png


BIN
currentSdk/res/drawable-hdpi/jm_close.png


BIN
currentSdk/res/drawable-hdpi/jm_close6.png


BIN
currentSdk/res/drawable-hdpi/jm_code.png


BIN
currentSdk/res/drawable-hdpi/jm_code_4.png


BIN
currentSdk/res/drawable-hdpi/jm_cut.png


BIN
currentSdk/res/drawable-hdpi/jm_email_5.png


BIN
currentSdk/res/drawable-hdpi/jm_eye_close.png


BIN
currentSdk/res/drawable-hdpi/jm_eye_close_4.png


BIN
currentSdk/res/drawable-hdpi/jm_eye_open.png


BIN
currentSdk/res/drawable-hdpi/jm_eye_open_4.png


BIN
currentSdk/res/drawable-hdpi/jm_float.png


BIN
currentSdk/res/drawable-hdpi/jm_float_3.png


BIN
currentSdk/res/drawable-hdpi/jm_float_4.png


BIN
currentSdk/res/drawable-hdpi/jm_float_gift.png


BIN
currentSdk/res/drawable-hdpi/jm_float_gift_4.png


BIN
currentSdk/res/drawable-hdpi/jm_float_move.png


BIN
currentSdk/res/drawable-hdpi/jm_float_move_3.png


BIN
currentSdk/res/drawable-hdpi/jm_float_move_new.png


BIN
currentSdk/res/drawable-hdpi/jm_float_new.png


BIN
currentSdk/res/drawable-hdpi/jm_float_on.png


BIN
currentSdk/res/drawable-hdpi/jm_float_on_3.png


BIN
currentSdk/res/drawable-hdpi/jm_float_on_4.png


BIN
currentSdk/res/drawable-hdpi/jm_float_on_new.png


BIN
currentSdk/res/drawable-hdpi/jm_float_service.png


BIN
currentSdk/res/drawable-hdpi/jm_float_service_4.png


BIN
currentSdk/res/drawable-hdpi/jm_float_user.png


BIN
currentSdk/res/drawable-hdpi/jm_float_user_4.png


BIN
currentSdk/res/drawable-hdpi/jm_gift.png


BIN
currentSdk/res/drawable-hdpi/jm_interval.png


BIN
currentSdk/res/drawable-hdpi/jm_iphone.png


BIN
currentSdk/res/drawable-hdpi/jm_kefu.png


BIN
currentSdk/res/drawable-hdpi/jm_kefu6.png


BIN
currentSdk/res/drawable-hdpi/jm_kefu_4.png


BIN
currentSdk/res/drawable-hdpi/jm_kefu_new.png


BIN
currentSdk/res/drawable-hdpi/jm_login_bg.png


BIN
currentSdk/res/drawable-hdpi/jm_logo.png


BIN
currentSdk/res/drawable-hdpi/jm_logo_3.png


BIN
currentSdk/res/drawable-hdpi/jm_logo_4.png


BIN
currentSdk/res/drawable-hdpi/jm_logo_new.png


BIN
currentSdk/res/drawable-hdpi/jm_password.png


BIN
currentSdk/res/drawable-hdpi/jm_password_4.png


BIN
currentSdk/res/drawable-hdpi/jm_phone.png


BIN
currentSdk/res/drawable-hdpi/jm_phone_4.png


BIN
currentSdk/res/drawable-hdpi/jm_protocol6.png


BIN
currentSdk/res/drawable-hdpi/jm_pwd.png


BIN
currentSdk/res/drawable-hdpi/jm_toast.png


BIN
currentSdk/res/drawable-hdpi/jm_unckeck6.png


BIN
currentSdk/res/drawable-hdpi/jm_urpulldown.png


BIN
currentSdk/res/drawable-hdpi/jm_urpulldown_new.png


BIN
currentSdk/res/drawable-hdpi/jm_urpullup_new.png


BIN
currentSdk/res/drawable-hdpi/jm_user.png


BIN
currentSdk/res/drawable-hdpi/jm_userl.png


+ 9 - 0
currentSdk/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> 

+ 9 - 0
currentSdk/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
currentSdk/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>

+ 33 - 0
currentSdk/res/drawable/jm_backlogin_btn.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <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="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <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="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <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>

+ 21 - 0
currentSdk/res/drawable/jm_blues_codebtn_style.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <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">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <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 > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <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>

+ 21 - 0
currentSdk/res/drawable/jm_blues_codebtn_style_new.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <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">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <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 > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <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>

+ 5 - 0
currentSdk/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
currentSdk/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
currentSdk/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
currentSdk/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
currentSdk/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
currentSdk/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
currentSdk/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>

+ 33 - 0
currentSdk/res/drawable/jm_cut_btn.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <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="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item android:state_focused="true">  <!-- 焦点 -->
+        <shape android:shape="rectangle">
+            <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="#d6d6d6" android:endColor="#d6d6d6" android:angle="270.0" />
+        </shape>
+    </item>
+    <item > <!-- 无焦点 -->
+        <shape android:shape="rectangle">
+            <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="#ffffff" android:endColor="#ffffff" android:angle="270.0" />
+        </shape>
+    </item>
+</selector>

+ 5 - 0
currentSdk/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
currentSdk/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
currentSdk/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
currentSdk/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>

+ 5 - 0
currentSdk/res/drawable/jm_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">
+    <stroke android:color="@color/jmfont_blues" android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
currentSdk/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
currentSdk/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
currentSdk/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>

+ 5 - 0
currentSdk/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
currentSdk/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>

+ 6 - 0
currentSdk/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
currentSdk/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
currentSdk/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>

+ 5 - 0
currentSdk/res/drawable/jm_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/jmfont_blues"/>
+    <corners android:topLeftRadius="5dp" android:bottomLeftRadius="5dp"/>
+</shape>

+ 5 - 0
currentSdk/res/drawable/jm_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/jmfont_blues" android:width="1dp"/>
+    <corners android:bottomLeftRadius="5dp" android:topLeftRadius="5dp"/>
+</shape>

+ 5 - 0
currentSdk/res/drawable/jm_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/jmfont_blues"/>
+    <corners android:topRightRadius="5dp" android:bottomRightRadius="5dp"/>
+</shape>

+ 5 - 0
currentSdk/res/drawable/jm_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/jmfont_blues" android:width="1dp"/>
+    <corners android:topRightRadius="5dp" android:bottomRightRadius="5dp"/>
+</shape>

+ 5 - 0
currentSdk/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
currentSdk/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>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.