Merge pull request #3 from kadbbz/dev

Merge dev to master
kadbbz · Nov 10, 2022 · 6ab3e49 · 6ab3e49
2 parents 4ec637e + 467f1fb
commit 6ab3e49
Show file tree

Hide file tree

Showing 39 changed files with 25,336 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdk 26
         versionCode 4
-        versionName '1.4.1-release'
+        versionName '1.5.0-release'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -44,8 +44,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
     implementation 'com.zhihu.android:matisse:0.5.3-beta3'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'com.github.jenly1314:zxing-lite:2.1.1'

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 4,
-      "versionName": "1.4.0-release",
+      "versionName": "1.5.0-release",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncy.css b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncy.css
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncy.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncy.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncyCalc.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncyCalc.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncyChart.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/forguncyChart.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/importExcel.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/importExcel.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/inputMan.css b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/inputMan.css
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/inputMan.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/inputMan.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/pvTable.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/pvTable.js
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/spread.css b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/spread.css
diff --git a/app/src/main/assets/hzg_bundle_cache_8.0.103.0/spread.js b/app/src/main/assets/hzg_bundle_cache_8.0.103.0/spread.js
diff --git a/app/src/main/assets/hzg_scripts_cache_8.0.103.0/Babel/7.10.4/polyfill.min.js b/app/src/main/assets/hzg_scripts_cache_8.0.103.0/Babel/7.10.4/polyfill.min.js
diff --git a/app/src/main/assets/hzg_scripts_cache_8.0.103.0/Bootstrap/ReadMe.txt b/app/src/main/assets/hzg_scripts_cache_8.0.103.0/Bootstrap/ReadMe.txt
@@ -0,0 +1,41 @@
+tooltip和dropdown是bootstrap库的一部分
+http://www.bootcss.com/
+
+一. JS
+在bootstrap代码包中
+tooltip.js文件来源：\js\tooltip.js
+dropdown.js文件来源：\js\dropdown.js
+
+a. tooltip
+在Forguncy，用于显示validation tooltip
+为了不干扰用户引用bootstrap库，
+在文件中做了如下修改：
+1. 注释了// TOOLTIP PLUGIN DEFINITION 部分代码
+2. 注释了// TOOLTIP NO CONFLICT 部分代码
+3. 将Tooltip类加入Forguncy命名空间
+  //Add by Forguncy
+  // ===================
+  if (Forguncy) {
+      Forguncy.Tooltip = Tooltip;
+  }
+
+b. dropdown
+在Forguncy，用于current user cell type
+为了不干扰用户引用bootstrap库，
+在文件中做了如下修改：
+1. 注释了// DROPDOWN PLUGIN DEFINITION 部分代码
+2. 注释了// DROPDOWN NO CONFLICT 部分代码
+3. 将属性值dropdown改为_dropdown
+  var toggle   = '[data-toggle=_dropdown]'
+
+二. CSS
+bootstrap.css文件来源：\dist\css\bootstrap.css
+css文件删除了与tooltip，dropdown无关部分，并做了如下修改
+
+  .tooltip.top .tooltip-arrow {
+   border-top-color: #000; ->#f00
+  }
+
+  .tooltip.bottom .tooltip-arrow {
+   border-bottom-color: #000; ->#f00
+  }