浏览代码

研龙MDB投币器+纸币混合支付

chenzhixiong 1 年之前
父节点
当前提交
0eaa82a68c
共有 100 个文件被更改,包括 519368 次插入84 次删除
  1. 0 32
      .idea/codeStyles
  2. 19 14
      .idea/jarRepositories.xml
  3. 25 11
      .idea/misc.xml
  4. 1 0
      .idea/vcs.xml
  5. 5 4
      BaseLibrary/build.gradle
  6. 519076 0
      BaseLibrary/class_files.txt
  7. 192 18
      BaseLibrary/proguard-rules.pro
  8. 7 2
      BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java
  9. 2 0
      BaseLibrary/src/main/java/com/hboxs/base_library/constant/Name.java
  10. 27 2
      BaseLibrary/src/main/java/com/hboxs/base_library/dialog/NormalDialog.java
  11. 9 0
      BaseLibrary/src/main/java/com/hboxs/base_library/http/NoPayOrderApi.java
  12. 5 1
      BaseLibrary/src/main/java/com/hboxs/base_library/http/PayApi.java
  13. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/a0000.png
  14. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/a222.png
  15. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/bb.png
  16. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/ben_zhifu.png
  17. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/bottom.png
  18. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_baojing.png
  19. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_canshu.png
  20. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai1.png
  21. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai2.png
  22. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai3.png
  23. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_alb.png
  24. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_bjly.png
  25. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_bl.png
  26. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dg.png
  27. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dm.png
  28. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dy.png
  29. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ey.png
  30. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_fl.png
  31. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ft.png
  32. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_fy.png
  33. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_hl.png
  34. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_hy.png
  35. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_jk.png
  36. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_kldy.png
  37. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_lmny.png
  38. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_lsh.png
  39. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_pty.png
  40. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_rd.png
  41. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ry.png
  42. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_sewy.png
  43. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_slfk.png
  44. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_turkey.png
  45. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_wkl.png
  46. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_xby.png
  47. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_xyl.png
  48. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ydl.png
  49. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_yw.png
  50. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_yy.png
  51. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_guowai_mny.png
  52. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_mima.png
  53. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_qita.png
  54. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_qxxuanze.png
  55. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_shangpin.png
  56. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_shuju.png
  57. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_tiaoshi.png
  58. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_xuanze.png
  59. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_xuanze_pay.png
  60. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_xuanzhong.png
  61. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/btn_yuyan.png
  62. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_brw.png
  63. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_brw_x.png
  64. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_r.png
  65. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_r_x.png
  66. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_ryb.png
  67. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_ryb_x.png
  68. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_w.png
  69. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/butterfly_w_x.png
  70. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_lrw.png
  71. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_lrw_x.png
  72. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_r.png
  73. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_r_x.png
  74. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_ryb.png
  75. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_ryb_x.png
  76. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_w.png
  77. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/clover_w_x.png
  78. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/contactbg.png
  79. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_lrw.png
  80. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_lrw_x.png
  81. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_r.png
  82. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_r_x.png
  83. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_ryb.png
  84. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_ryb_x.png
  85. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_w.png
  86. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/dropwort_w_x.png
  87. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/ico_contact.png
  88. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_bj.png
  89. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_coin.png
  90. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_cstz.png
  91. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_cuo.png
  92. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_discounts_code.png
  93. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_dui.png
  94. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui.png
  95. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui_block.png
  96. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui_line.png
  97. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_guan_pay.png
  98. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_guanbi.png
  99. 二进制
      BaseLibrary/src/main/res/drawable-hdpi/icon_guanji.png
  100. 0 0
      BaseLibrary/src/main/res/drawable-hdpi/icon_logo.png

+ 0 - 32
.idea/codeStyles

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleConfiguration">
-    <code_scheme name="Project" version="173">
-      <Objective-C-extensions>
-        <file>
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-        </file>
-        <class>
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-          <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-        </class>
-        <extensions>
-          <pair source="cpp" header="h" fileNamingConvention="NONE" />
-          <pair source="c" header="h" fileNamingConvention="NONE" />
-        </extensions>
-      </Objective-C-extensions>
-    </code_scheme>
-  </component>
-</project>

+ 19 - 14
.idea/jarRepositories.xml

@@ -12,24 +12,24 @@
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="maven3" />
-      <option name="name" value="maven3" />
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://maven.aliyun.com/repository/google" />
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="maven2" />
       <option name="name" value="maven2" />
-      <option name="url" value="https://maven.aliyun.com/repository/jcenter" />
+      <option name="url" value="https://maven.aliyun.com/repository/google" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://jitpack.io" />
+      <option name="id" value="maven5" />
+      <option name="name" value="maven5" />
+      <option name="url" value="http://mvn.gt.igexin.com/nexus/content/repositories/releases/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="BintrayJCenter" />
@@ -37,14 +37,19 @@
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.aliyun.com/repository/jcenter" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="Google" />
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
   </component>
 </project>

+ 25 - 11
.idea/misc.xml

@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/Desktop/paymodule_icecream-lite-main/icecream-lite-main/BaseLibrary/src/main/res/layout-land/dialog_et.xml" value="0.21119929453262787" />
-        <entry key="..\:/Users/Desktop/paymodule_icecream-lite-main/icecream-lite-main/BaseLibrary/src/main/res/layout/layout_title_bar.xml" value="0.24947916666666667" />
-        <entry key="..\:/Users/Desktop/paymodule_icecream-lite-main/icecream-lite-main/BaseLibrary/src/main/res/layout/line_white.xml" value="0.22291666666666668" />
-        <entry key="..\:/Users/Desktop/paymodule_icecream-lite-main/icecream-lite-main/app/src/main/res/layout/fragment_pay_select.xml" value="0.1" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/dingdian_seekbar_progress_drawable.xml" value="0.155" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/shape_btn_back.xml" value="0.141" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/shape_btn_login.xml" value="0.155" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/drawable/shape_et_login.xml" value="0.141" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout-land/dialog_normal.xml" value="0.21119929453262787" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/activity_base_web_view.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/dialog_normal.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/item_user_home.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/layout_empty_data.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_authnumer.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_device_manager.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_fragment.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_main.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_sn_setting.xml" value="0.12132725430597771" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_credit_card.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mdbcredit_card.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mix_pay_now.xml" value="0.4" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_pay.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_update.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_ice_cream.xml" value="0.1" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_main.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_pay_select.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_technology_support.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_shop_cart.xml" value="0.24947916666666667" />
       </map>
     </option>
   </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 1 - 0
.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/icecream-lite-main" vcs="Git" />
   </component>
 </project>

+ 5 - 4
BaseLibrary/build.gradle

@@ -19,9 +19,10 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            //  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            consumerProguardFiles  'proguard-rules.pro'
+            minifyEnabled true
+            zipAlignEnabled true
+//            shrinkResources true
+              proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             debuggable false
             buildConfigField 'Boolean', 'isDebug', 'true'
         }
@@ -86,7 +87,7 @@ dependencies {
     //    api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
     //Glide
     api rootProject.ext.dependencies["glide"]
-//    api files('libs\\zixing-core-3.2.0.jar')
+    api files('libs/zixing-core-3.2.0.jar')
     api files('libs/btsdk.jar')
     annotationProcessor rootProject.ext.dependencies["glide-compiler"]
     //glide-transformations

文件差异内容过多而无法显示
+ 519076 - 0
BaseLibrary/class_files.txt


+ 192 - 18
BaseLibrary/proguard-rules.pro

@@ -19,28 +19,202 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--keep public class com.hboxs.base_library.http.response.HttpResult
+# 代码混淆压缩比,在0~7之间,默认为5,一般不做修改
+-optimizationpasses 5
 
-# Retrofit
--dontnote retrofit2.Platform
--dontnote retrofit2.Platform$IOS$MainThreadExecutor
--dontwarn retrofit2.Platform$Java8
+# 混合时不使用大小写混合,混合后的类名为小写
+-dontusemixedcaseclassnames
+
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+
+# 不做预校验,preverify是proguard的四个步骤之一,Android不需要preverify,去掉这一步能够加快混淆速度。
+-dontpreverify
+
+# 保留Annotation不混淆 这在JSON实体映射时非常重要,比如fastJson
+-keepattributes *Annotation*,InnerClasses
+
+# 避免混淆泛型
 -keepattributes Signature
--keepattributes Exceptions
 
-# okhttp
--dontwarn okio.**
+# 抛出异常时保留代码行号
+-keepattributes SourceFile,LineNumberTable
+
+# 指定混淆是采用的算法,后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法,一般不做更改
+-optimizations !code/simplification/cast,!field/*,!class/merging/*
+
+# 忽略警告
+-ignorewarnings
+
+# 设置是否允许改变作用域
+-allowaccessmodification
+
+# 把混淆类中的方法名也混淆了
+-useuniqueclassmembernames
+
+# apk 包内所有 class 的内部结构
+-dump class_files.txt
+
+# 未混淆的类和成员
+-printseeds seeds_txt
+
+# 列出从apk中删除的代码
+-printusage unused.txt
+
+# 混淆前后的映射
+-printmapping mapping.txt
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgent
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.support.v4.app.Fragment
+-keep public class * extends android.app.Fragment
+-keep public class * extends android.view.view
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class * extends android.support.v4.**{
+    <fields>;
+    <methods>;
+}
+-keep public class * extends android.support.v7.**
+-keep public class * extends android.support.annotation.**
+-keepattributes *Annotation*
+
+-keepattributes *JavascriptInterface*
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keep class * implements java.io.Serializable {
+    public *;
+}
+
+-keepclassmembers class * implements java.io.Serializable {
+   static final long serialVersionUID;
+   private static final java.io.ObjectStreamField[] serialPersistentFields;
+   !static !transient <fields>;
+   private void writeObject(java.io.ObjectOutputStream);
+   private void readObject(java.io.ObjectInputStream);
+   java.lang.Object writeReplace();
+   java.lang.Object readResolve();
+}
+
+-keep class com.google.gson.** {*;}
+-keep class sun.misc.Unsafe {*;}
+-keep class com.google.gson.stream.** {*;}
+-keep class com.google.gson.examples.android.model.** {*;}
+-keep class com.google.** {
+    <fields>;
+    <methods>;
+}
+
+#保持自定义控件类不被混淆
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
 
+#保持自定义控件类不被混淆
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
 
-# RxJava RxAndroid
--dontwarn sun.misc.**
--keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
-    long producerIndex;
-    long consumerIndex;
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
 }
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
-    rx.internal.util.atomic.LinkedQueueNode producerNode;
+
+#butterknife
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+-keep class **$$ViewIjector { *; }
+-keepclasseswithmembernames class * {
+    @butterknife.* <fields>;
 }
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
-    rx.internal.util.atomic.LinkedQueueNode consumerNode;
-}
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <methods>;
+}
+#butterknife
+
+
+#iot-check
+-keep class com.bgy.iot.** { *; }
+-keep class io.netty.** { *; }
+#iot-check
+
+#打印机的
+-keep class com.printsdk.**{*;}
+
+-keep class android.net.http.SslError
+-keep class android.webkit.**{*;}
+-keep class cn.sharesdk.**{*;}
+-keep class com.sina.**{*;}
+-keep class m.framework.**{*;}
+-keep class **.R$* {*;}
+-keep class **.R{*;}
+-dontwarn cn.sharesdk.**
+-dontwarn **.R$*
+
+-keep class  * extends com.bgy.autosale.base.ui.BaseFragment
+-keep class  * extends com.bgy.autosale.base.ui.BaseAutoExitFragment
+-keep class  * extends com.bgy.autosale.base.ui.BaseActivity
+-keep class * implements com.bgy.autosale.interfaces.FlavorInterface {
+    public *;
+}
+
+### greenDAO 3
+-keep class org.greenrobot.greendao.**{*;}
+-keep public class * extends org.greenrobot.greendao.AbstractDao
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+    public static java.lang.String TABLENAME;
+    public *;
+}
+-keep class **$Properties
+-keepclassmembers class **$Properties {*;}
+
+
+# 如果类中有使用了注解的字段,则不混淆类和类成员
+-keepclasseswithmembers class * {
+    @com.bgy.autosale.socket.base.ServerMethod <methods>;
+}
+
+# 如果类中有使用了注解的字段,则不混淆类和类成员
+-keepclasseswithmembers class * {
+    @com.bgy.autosale.socket.base.ServerApi <methods>;
+}
+# 如果类中有使用了注解的字段,则不混淆类和类成员
+-keepclasseswithmembers class * {
+    @com.bgy.plc.proxys.base.ProxyMethod <methods>;
+}
+
+# 如果类中有使用了注解的字段,则不混淆类和类成员
+-keepclasseswithmembers class * {
+    @com.bgy.plc.proxys.base.ProxySendApi <methods>;
+}
+
+#个推
+-dontwarn com.igexin.**
+-keep class com.igexin.** { *; }
+-keep class org.json.** { *; }
+
+
+-keep public class  com.hboxs.base_library.beans.** {
+    public void set*(***);
+    public *** get*();
+    public *** is*();
+    }

+ 7 - 2
BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -27,7 +27,7 @@ public abstract class Global {
      * 1:
      * 2:国外线上
      */
-    public static final int isVersions = 1;
+    public static final int isVersions = 2;
 
     /**
      * 信用卡支付方式user
@@ -123,6 +123,7 @@ public abstract class Global {
      * 一次购买plc硬币剩余金额,剩余金额无法进行倍率计算,这个需要注意。
      */
     public static BigDecimal buyBalance = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
+    public static BigDecimal hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
 
 
     /**
@@ -225,9 +226,13 @@ public abstract class Global {
 
     //d2的状态,表示做糖列表没有了,可以根据d2的状态进行判断。
     public static boolean d2Status = false;//false表示还在制作,true表示可以制作了。
-    public static int creditCardMultiplier = Hawk.get(Name.MDB_RATE, 100);
+    public static int creditCardMultiplier = Hawk.get(Name.MDB_RATE, 1);
 
     //表示
     public static int isUserHome = 0; // 0 不在 1在
+
+    public static boolean MDBCreditCardSuccess=false;
+    public static int MDBCreditCardSuccessNumber=0;
+
 }
 

+ 2 - 0
BaseLibrary/src/main/java/com/hboxs/base_library/constant/Name.java

@@ -9,6 +9,8 @@ public interface Name {
 
     String ADMIN = "admin";
     String GUEST = "guest";
+
+    String SI320 = "SI320";//标准版
     String MG320_18 = "MG320";//标准版
     String MG320_30 = "MG320-1";//30种花型
     String MG320_22 = "MG320-2";//川博

+ 27 - 2
BaseLibrary/src/main/java/com/hboxs/base_library/dialog/NormalDialog.java

@@ -3,6 +3,7 @@ package com.hboxs.base_library.dialog;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
 import android.support.v4.widget.TextViewCompat;
 import android.view.View;
 import android.widget.Button;
@@ -13,6 +14,7 @@ import com.hboxs.base_library.R;
 import com.hboxs.base_library.callback.DialogClickListener;
 import com.hboxs.base_library.constant.Name;
 import com.hboxs.base_library.util.DrawableSelectorUtils;
+import com.hboxs.base_library.util.LongClickUtils;
 import com.hboxs.base_library.util.SharedPreferencesUtils;
 import com.hboxs.base_library.util.UiUtil;
 import com.hboxs.base_library.widget.BaseDialogNoDatabinding;
@@ -58,8 +60,8 @@ public class NormalDialog extends BaseDialogNoDatabinding implements View.OnClic
         IvQrCode = findViewById(R.id.iv_qr_code);
         btnConfirm.setOnClickListener(this);
         btnCancel.setOnClickListener(this);
-        Drawable updateDrawableSelector = DrawableSelectorUtils.createUpdateDrawableSelector(mActivity);
-        btnConfirm.setBackground(updateDrawableSelector);
+//        Drawable updateDrawableSelector = DrawableSelectorUtils.createUpdateDrawableSelector(mActivity);
+//        btnConfirm.setBackground(updateDrawableSelector);
 
     }
 
@@ -202,4 +204,27 @@ public class NormalDialog extends BaseDialogNoDatabinding implements View.OnClic
         }
         btnCancel.setText(text);
     }
+
+    public void setTimeContent(int title, int content) {
+
+        tvTitle.setText(title);
+        tvContent.setText(content);
+//        btnCancel.setText(R.string.back);
+//        tvContentTime.setVisibility(View.VISIBLE);
+
+    }
+
+    public void hideDialogContent() {
+
+        // 隐藏控件
+        btnConfirm.setVisibility(View.GONE);
+        btnCancel.setVisibility(View.GONE);
+        LongClickUtils.setLongClick(new Handler(), tvContent, 3000, new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                btnCancel.setVisibility(View.VISIBLE);
+                return false;
+            }
+        });
+    }
 }

+ 9 - 0
BaseLibrary/src/main/java/com/hboxs/base_library/http/NoPayOrderApi.java

@@ -87,4 +87,13 @@ public interface NoPayOrderApi {
     @POST("tOrder/getMealCode")
     Observable<HttpResult<String>> getMealCode(@QueryMap Map<String, String> params);
 
+    //获取当前机器的连接ID,进入屏幕后台才去请求
+    @GET("api/app_equipment/index/getManagerId.htm")
+    Observable<String> getManagerId(@QueryMap Map<String, String> params);
+
+    //脱离系统api
+    @FormUrlEncoded
+    @POST("api/app_equipment/index/separate.htm")
+    Observable<HttpResult<String>> separate(@FieldMap Map<String, String> params);
+
 }

+ 5 - 1
BaseLibrary/src/main/java/com/hboxs/base_library/http/PayApi.java

@@ -22,6 +22,11 @@ public interface PayApi {
     @POST()
     Observable<HttpResult<String>> carsPay(@Url String url, @Body RequestBody body);
 
+    @POST()
+    Observable<HttpResult<String>> icCarsPay(@Url String url, @Body RequestBody body);
+
+    @GET("tOrder/iceCreamTwoPay")
+    Observable<HttpResult<String>> icCardPay(@QueryMap Map<String, String> params);
 
     //删除多余的订单
     @GET("tOrder/deleteOrder")
@@ -77,5 +82,4 @@ public interface PayApi {
 
 
 
-
 }

二进制
BaseLibrary/src/main/res/drawable-hdpi/a0000.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/a222.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/bb.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/ben_zhifu.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/bottom.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_baojing.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_canshu.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai1.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai2.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai3.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_alb.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_bjly.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_bl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dg.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dm.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_dy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ey.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_fl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ft.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_fy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_hl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_hy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_jk.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_kldy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_lmny.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_lsh.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_pty.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_rd.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ry.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_sewy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_slfk.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_turkey.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_wkl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_xby.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_xyl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_ydl.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_yw.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_goumai_yy.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_guowai_mny.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_mima.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_qita.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_qxxuanze.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_shangpin.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_shuju.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_tiaoshi.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_xuanze.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_xuanze_pay.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_xuanzhong.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/btn_yuyan.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_brw.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_brw_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_r.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_r_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_ryb.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_ryb_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_w.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/butterfly_w_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_lrw.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_lrw_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_r.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_r_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_ryb.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_ryb_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_w.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/clover_w_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/contactbg.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_lrw.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_lrw_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_r.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_r_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_ryb.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_ryb_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_w.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/dropwort_w_x.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/ico_contact.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_bj.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_coin.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_cstz.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_cuo.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_discounts_code.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_dui.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui_block.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_fanhui_line.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_guan_pay.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_guanbi.png


二进制
BaseLibrary/src/main/res/drawable-hdpi/icon_guanji.png


+ 0 - 0
BaseLibrary/src/main/res/drawable-hdpi/icon_logo.png


部分文件因为文件数量过多而无法显示