merger框架改动

Author: geeklx

README.md

@@ -1,6 +1,6 @@
 # hunheappkuangjia
 
-混合移动应用框架APP-Android20
+混合移动应用框架APP-Android21
 
 ### 1.ANROOMCrashActivity：验证APP压力测试
 ### 
@@ -337,7 +337,7 @@
 <br/>    api 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.3.0'       监听键盘弹出过程
 <br/>    // https://github.com/getActivity/ToastUtils
 <br/>    api 'com.hjq:toast:5.8'
-<br/>    // https://github.com/everhad/AndroidRatingStar         评论星星
+<br/>    // https://github.com/everhad/AndroidRatingStar         评论星星 PingfenMainActivity
 <br/>    api 'com.github.everhad:AndroidRatingStar:v1.0.4'
 <br/>    // https://github.com/li-xiaojun/XPopup                 弹出框
 <br/>    api 'com.lxj:xpopup:1.8.4'
@@ -380,7 +380,7 @@
 <br/>    api project(':commonlibs:hunheku:libapppay')
 <br/>    // Glide 4.0以上
 <br/>    api librarys.glide47
-<br/>    api project(':commonlibs:hunheku:libglide47')
+<br/>    api project(':commonlibs:common:libglide47')
 <br/>    //TODO other libs
 <br/>    // https://github.com/crazyandcoder/citypicker                      城市选择器
 <br/>    // pi 'liji.library.dev:citypickerview:4.3.2'
@@ -395,7 +395,7 @@
 <br/>    api project(':commonlibs:yewulibs:slbota')
 <br/>    // https://github.com/ikew0ng/SwipeBackLayout                       
 <br/>    // api 'me.imid.swipebacklayout.lib:library:1.1.0'                  关闭页面IOS效果
-<br/>    api project(':commonlibs:yewulibs:slbswipebacklayout')
+<br/>    api project(':commonlibs:common:libswipebacklayout')
 <br/>    // slbwifi                                                      WIFI选择器            
 <br/>    api project(':commonlibs:yewulibs:slbwifi') 
 <br/>    // https://github.com/scwang90/SmartRefreshLayout               下拉刷新上拉加载
@@ -437,6 +437,8 @@
 ### 99.commonlibs：dkplayer：DK播放器支持推流
 ### 
 ### 100.slbyanzheng：指纹登录组件
+### 
+### 101.HuxiAct：布局加载组件
 
 
 

build.gradle

@@ -6,10 +6,11 @@ buildscript {
         google()
         mavenLocal()
         mavenCentral()
-        maven { url "https://jitpack.io" }
+        maven { url "https://www.jitpack.io" }
         maven { url 'https://maven.aliyun.com/repository/public/' }
         maven { url "http://mvn.mob.com/android" }
-        maven {url  "http://maven.rongcloud.cn/repository/maven-releases/"}
+        maven { url "http://maven.rongcloud.cn/repository/maven-releases/" }
+        maven { url 'https://gitee.com/pgyer2020/analytics/raw/master' }  // 备用仓库
         maven { url 'http://developer.huawei.com/repo/' }
     }
     dependencies {
@@ -31,10 +32,11 @@ allprojects {
         google()
         mavenLocal()
         mavenCentral()
-        maven { url "https://jitpack.io" }
+        maven { url "https://www.jitpack.io" }
         maven { url 'https://maven.aliyun.com/repository/public/' }
         maven { url "http://mvn.mob.com/android" }
-        maven {url  "http://maven.rongcloud.cn/repository/maven-releases/"}
+        maven { url "http://maven.rongcloud.cn/repository/maven-releases/" }
+        maven { url 'https://gitee.com/pgyer2020/analytics/raw/master' }  // 备用仓库
         maven { url 'http://developer.huawei.com/repo/' }
 
 //        flatDir {

buildconfig.gradle

@@ -7,16 +7,16 @@ ext {
     supportLibVersion = '30.0.0'
 
     // 灯塔版本号
-    dengtaversionCode = 10000
-    dengtaversionName = "1.0.0.0"
+    dengtaversionCode = 20000
+    dengtaversionName = "2.0.0.0"
 
     // 大屏版本号
-    dapingversionCode = 10000
-    dapingversionName = "1.0.0.0"
+    dapingversionCode = 20000
+    dapingversionName = "2.0.0.0"
 
 //    applicationId = "com.fosung.lighthouse"
-    appversionCode = 1000
-    appversionName = "1.0.0.0"
+    appversionCode = 2000
+    appversionName = "2.0.0.0"
 
     versionNamePrefixT = "_T_V"
     versionNamePrefixY = "_Y_V"
@@ -74,7 +74,7 @@ retrofitgconverterscalars         : "com.squareup.retrofit2:converter-scalars:2.
 // ------------- 图片加载 -------------
 fresco                            : "com.facebook.fresco:fresco:0.11.0",
 animatedGif                       : "com.facebook.fresco:animated-gif:0.12.0",
-picasso                           : "com.squareup.picasso:picasso:2.5.2",
+picasso                           : "com.squareup.picasso:picasso:2.71828",
 photoView                         : "com.github.chrisbanes:PhotoView:2.1.3",
 nineoldandroids                   : "com.nineoldandroids:library:2.4.0",
 zxing                             : "com.google.zxing:core:3.2.1",

commonlibs/baselibrary/build.gradle

@@ -5,20 +5,11 @@ apply from: './../../commonlibs1.gradle'
 def librarys = rootProject.ext.dependencies //依赖
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':commonlibs:hunheku:libutils')
+    api project(':commonlibs:common:libutils')
+    api project(':commonlibs:common:libbase')
     // 网络请求
-    api project(':commonlibs:hunheku:libmvp')
-    api project(':commonlibs:hunheku:libretrofit')
-    // webView
-    api project(':commonlibs:hunheku:libagentweb-core')
-    api project(':commonlibs:hunheku:libagentweb-filechooser')
-//    api 'com.just.agentweb:agentweb-androidx:4.1.4' // (必选)
-//    api 'com.just.agentweb:filechooser-androidx:4.1.4'// (可选)
-//    api 'com.download.library:downloader-androidx:4.1.4'// (可选)
-    // webView
-    api project(':commonlibs:hunheku:libwebview')
-    // 权限
-    api project(':commonlibs:hunheku:librararyforfileprovdider')
+    api project(':commonlibs:common:libmvp')
+    api project(':commonlibs:common:libretrofit')
     // app升级
     api project(':commonlibs:hunheku:libupdateapputilsold')
     // https://github.com/teprinciple/UpdateAppUtils
@@ -29,28 +20,11 @@ dependencies {
     api 'com.mikepenz:community-material-typeface:1.8.36.1@aar'
     // https://github.com/drakeet/MultiType
     api 'me.drakeet.multitype:multitype:3.4.4'
-    // https://github.com/CymChad/BaseRecyclerViewAdapterHelper
-    api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.40'
     // https://github.com/jaredrummler/MaterialSpinner
     api 'com.jaredrummler:material-spinner:1.2.5'
-    // https://github.com/kyleduo/SwitchButton
-//    api 'com.kyleduo.switchbutton:library:2.0.3'
     // https://github.com/drawthink/ExpandableRecyclerView
 //    api 'com.drawthink:expandable-recyclerview:0.0.3'
     api project(':commonlibs:hunheku:libexpandablerecyclerview')
-    // https://github.com/BolexLiu/AutoEx
-//    api 'com.github.BolexLiu.AutoEx:AutoEx-Lib-No-Op:v1.0.8'
-    // https://github.com/Jzvd/JZVideo
-//    api 'cn.jzvd:jiaozivideoplayer:7.6.0'
-    // https://github.com/HuanHaiLiuXin/CoolViewPager
-    api 'com.github.HuanHaiLiuXin:CoolViewPager:v1.0.0'
-    // https://github.com/airbnb/lottie-android
-    api 'com.airbnb.android:lottie:3.4.2'
-    // https://github.com/greenrobot/EventBus
-    api 'org.greenrobot:eventbus:3.1.1'
-    // https://github.com/Meituan-Dianping/walle
-//    api 'com.meituan.android.walle:library:1.1.7'
-//    api 'com.github.GeekCodesTeam:walle:1.1.7'
     // https://github.com/BolexLiu/PressScanCode
     api 'com.github.BolexLiu:PressScanCode:v1.0.0'
     // https://github.com/ethanhua/Skeleton
@@ -61,13 +35,11 @@ dependencies {
 //    api 'com.larswerkman:lobsterpicker:1.0.1'
     // https://github.com/square/leakcanary
     api librarys.leakcanaryAndroid
-    // https://github.com/gongwen/MarqueeViewLibrary
-//    api 'com.gongwen:marqueelibrary:1.1.3'
     // https://github.com/KunMinX/Linkage-RecyclerView
 //    api 'com.kunminx.linkage:linkage-recyclerview:2.3.5'
     api project(':commonlibs:hunheku:liblinkagerecyclerview')
     // https://github.com/LuckSiege/PictureSelector
-    api 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.1'
+    api project(':commonlibs:yewulibs:slbpictureselector')
     // https://github.com/dongjunkun/DropDownMenu
     api 'com.github.dongjunkun:DropDownMenu:1.0.4'
     // https://github.com/jgilfelt/SystemBarTint
@@ -99,25 +71,24 @@ dependencies {
     api 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.3.0'
     // https://github.com/getActivity/ToastUtils
     api 'com.github.getActivity:ToastUtils:9.2'
-    // https://github.com/everhad/AndroidRatingStar
-    api 'com.github.everhad:AndroidRatingStar:v1.0.4'
     // https://github.com/li-xiaojun/XPopup
     api 'com.github.li-xiaojun:XPopup:2.3.4'
     // https://github.com/meetsl/SCardView-master
-    api 'io.github.meetsl:SCardView:1.1'
+    api 'io.github.meetsl:SCardView:1.2'
     // https://github.com/nanchen2251/BankCardUtils
     api 'com.github.nanchen2251:BankCardUtils:1.0.2'
     // https://github.com/SherlockGougou/BigImageViewPager
-    api 'com.github.SherlockGougou:BigImageViewPager:v4_2.1.0'
+    api 'com.github.SherlockGougou:BigImageViewPager:androidx-6.1.5'
+    // matisse
+    api("com.zhihu.android:matisse:0.5.3-beta3") {
+        exclude group: 'com.github.bumptech.glide'
+    }
     // https://github.com/zzhoujay/RichText/
     api 'com.zzhoujay.richtext:richtext:3.0.7'
     // https://github.com/maning0303/MNProgressHUD
 //    api 'com.github.maning0303:MNProgressHUD:V1.1.8X'
     // https://github.com/MZCretin/ExpandableTextView
     api 'com.github.MZCretin:ExpandableTextView:v1.6.1-x'
-    // https://github.com/Manabu-GT/ExpandableTextView
-    api 'com.ms-square:expandableTextView:0.1.4'
     // https://github.com/yanzhenjie/NoFragment
-//    api 'com.yanzhenjie:fragment:1.0.1'
     api project(':commonlibs:hunheku:libyanzhenjiebase')
 }

commonlibs/baselibrary/src/main/AndroidManifest.xml

@@ -2,6 +2,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.haier.cellarette.baselibrary">
 
+    <uses-permission
+        android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="au.com.example.READ_CONTENT" />
     <uses-permission android:name="au.com.example.WRITE_CONTENT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -20,11 +23,14 @@
     <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
 
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions" />
+    <uses-permission
+        android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -545,6 +551,46 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <activity android:name=".ratingstarview.PingfenMainActivity">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.PingfenMainActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".marqueelibrary.ui.MarqueeViewLibraryAct">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.MarqueeViewLibraryAct" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".scardview.SCardViewAct">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.SCardViewAct" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".scardview.SCardViewAct1" />
+        <activity android:name=".scardview.SCardViewAct2" />
+        <activity android:name=".scardview.SCardViewAct3" />
+
+        <activity android:name=".bigImageviewpager.BigImageViewPagerAct">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.BigImageViewPagerAct" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".expandabletextview.ExpandableTextViewAct">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.ExpandableTextViewAct" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".expandabletextview.ShowInRecyclerViewActivity" />
 
         <receiver android:name=".networkview.NetworkChangeListener" />
 

commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/Act.java

@@ -0,0 +1,14 @@
+package com.haier.cellarette.baselibrary;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class Act  extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_marqueeviewlibrary);
+    }
+}

commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/TestCode.java

@@ -41,8 +41,8 @@
 
 //import android.support.annotation.AttrRes;
 //import android.support.annotation.DrawableRes;
-//import android.support.annotation.NonNull;
-//import android.support.annotation.Nullable;
+//
+//
 //import android.support.annotation.RequiresApi;
 //import android.support.annotation.StyleRes;
 //import androidx.core.view.PagerAdapter;