CNLive Android Team / CNLivePayDemo · Commits

Commit 8a91cc864e4bcbf437fb0bf671bf4741d6c4ff4c

Authored by 朱显松
1 parent 98c51faf

1.更新微信支付SDK 

2.修复内部逻辑操作对象空指针问题
3.新增支付接口携带渠道参数统计功能
Inline Side-by-side
Showing 5 changed files with 120 additions and 3 deletions
.idea/codeStyles/Project.xml 0 → 100644
  View file @8a91cc8
  1 +<component name="ProjectCodeStyleConfiguration">
  2 + <code_scheme name="Project" version="173">
  3 + <codeStyleSettings language="XML">
  4 + <indentOptions>
  5 + <option name="CONTINUATION_INDENT_SIZE" value="4" />
  6 + </indentOptions>
  7 + <arrangement>
  8 + <rules>
  9 + <section>
  10 + <rule>
  11 + <match>
  12 + <AND>
  13 + <NAME>xmlns:android</NAME>
  14 + <XML_ATTRIBUTE />
  15 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  16 + </AND>
  17 + </match>
  18 + </rule>
  19 + </section>
  20 + <section>
  21 + <rule>
  22 + <match>
  23 + <AND>
  24 + <NAME>xmlns:.*</NAME>
  25 + <XML_ATTRIBUTE />
  26 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  27 + </AND>
  28 + </match>
  29 + <order>BY_NAME</order>
  30 + </rule>
  31 + </section>
  32 + <section>
  33 + <rule>
  34 + <match>
  35 + <AND>
  36 + <NAME>.*:id</NAME>
  37 + <XML_ATTRIBUTE />
  38 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  39 + </AND>
  40 + </match>
  41 + </rule>
  42 + </section>
  43 + <section>
  44 + <rule>
  45 + <match>
  46 + <AND>
  47 + <NAME>.*:name</NAME>
  48 + <XML_ATTRIBUTE />
  49 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  50 + </AND>
  51 + </match>
  52 + </rule>
  53 + </section>
  54 + <section>
  55 + <rule>
  56 + <match>
  57 + <AND>
  58 + <NAME>name</NAME>
  59 + <XML_ATTRIBUTE />
  60 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  61 + </AND>
  62 + </match>
  63 + </rule>
  64 + </section>
  65 + <section>
  66 + <rule>
  67 + <match>
  68 + <AND>
  69 + <NAME>style</NAME>
  70 + <XML_ATTRIBUTE />
  71 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  72 + </AND>
  73 + </match>
  74 + </rule>
  75 + </section>
  76 + <section>
  77 + <rule>
  78 + <match>
  79 + <AND>
  80 + <NAME>.*</NAME>
  81 + <XML_ATTRIBUTE />
  82 + <XML_NAMESPACE>^$</XML_NAMESPACE>
  83 + </AND>
  84 + </match>
  85 + <order>BY_NAME</order>
  86 + </rule>
  87 + </section>
  88 + <section>
  89 + <rule>
  90 + <match>
  91 + <AND>
  92 + <NAME>.*</NAME>
  93 + <XML_ATTRIBUTE />
  94 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
  95 + </AND>
  96 + </match>
  97 + <order>ANDROID_ATTRIBUTE_ORDER</order>
  98 + </rule>
  99 + </section>
  100 + <section>
  101 + <rule>
  102 + <match>
  103 + <AND>
  104 + <NAME>.*</NAME>
  105 + <XML_ATTRIBUTE />
  106 + <XML_NAMESPACE>.*</XML_NAMESPACE>
  107 + </AND>
  108 + </match>
  109 + <order>BY_NAME</order>
  110 + </rule>
  111 + </section>
  112 + </rules>
  113 + </arrangement>
  114 + </codeStyleSettings>
  115 + </code_scheme>
  116 +</component>
0 117 \ No newline at end of file
... ...
.idea/gradle.xml
  View file @8a91cc8
... ... @@ -12,6 +12,7 @@
12 12 </set>
13 13 </option>
14 14 <option name="resolveModulePerSourceSet" value="false" />
  15 + <option name="testRunner" value="PLATFORM" />
15 16 </GradleProjectSettings>
16 17 </option>
17 18 </component>
... ...
.idea/modules.xml
  View file @8a91cc8
... ... @@ -3,8 +3,6 @@
3 3 <component name="ProjectModuleManager">
4 4 <modules>
5 5 <module fileurl="file://$PROJECT_DIR$/CNLivePayDemo.iml" filepath="$PROJECT_DIR$/CNLivePayDemo.iml" />
6   - <module fileurl="file://$PROJECT_DIR$/CNLivePayDemo.iml" filepath="$PROJECT_DIR$/CNLivePayDemo.iml" />
7   - <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
8 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
9 7 </modules>
10 8 </component>
... ...
app/build.gradle
  View file @8a91cc8
... ... @@ -47,5 +47,7 @@ dependencies {
47 47 compile 'com.android.support.constraint:constraint-layout:1.0.2'
48 48 testCompile 'junit:junit:4.12'
49 49  
50   - compile 'com.cnlive:lib_cnpay:1.0.9'
  50 + compile 'com.cnlive:lib_cnpay:1.0.9.1'
  51 +
  52 + compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1'
51 53 }
... ...
app/libs/libammsdk.jar deleted 100644 → 0
View file @98c51fa
No preview for this file type