merger支持商业化apk生成

Author: geeklx

README.md

@@ -1,7 +1,7 @@
 # hunheappkuangjia
 
-混合移动应用框架APP-Android21
-
+混合移动应用框架APP-Android26
+### 附：请切换mavencentral分支开发
 ###
 ![效果图](https://github.com/GeekCodesTeam/androidkuangjia2021/blob/main/zuser_adapter%2Bxml/111111.jpg "1")
 ![效果图](https://github.com/GeekCodesTeam/androidkuangjia2021/blob/main/zuser_adapter%2Bxml/222222.jpg "2")

build.gradle

@@ -1,20 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "buildconfig.gradle"
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.5.21'
     repositories {
         google()
         mavenLocal()
         mavenCentral()
         maven { url "https://www.jitpack.io" }
         maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven {
+            url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
+        }
         maven { url "http://mvn.mob.com/android" }
         maven { url "http://maven.rongcloud.cn/repository/maven-releases/" }
         maven { url "https://raw.githubusercontent.com/Pgyer/analytics/master" }
         maven { url 'http://developer.huawei.com/repo/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.meituan.android.walle:plugin:1.1.7'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' // add plugin
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -24,6 +27,8 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.4.1.300'
         //jitpack
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line
+        // 添加emas-services插件
+        classpath 'com.aliyun.ams:emas-services:1.0.1'
     }
 }
 
@@ -34,6 +39,9 @@ allprojects {
         mavenCentral()
         maven { url "https://www.jitpack.io" }
         maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven {
+            url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
+        }
         maven { url "http://mvn.mob.com/android" }
         maven { url "http://maven.rongcloud.cn/repository/maven-releases/" }
         maven { url "https://raw.githubusercontent.com/Pgyer/analytics/master" }

buildconfig.gradle

@@ -6,17 +6,21 @@ ext {
     targetSdkVersion = 30
     supportLibVersion = '30.0.0'
 
-    // 灯塔版本号
-    dengtaversionCode = 20000
-    dengtaversionName = "2.0.0.0"
+    // 灯塔VPN版本号
+    isMIModeVPN = true
+    dengtaversionCode = 10006
+    dengtaversionName = "1.0.0.6"
 
     // 大屏版本号
     dapingversionCode = 20000
     dapingversionName = "2.0.0.0"
 
+//    # for MIM
+//    # is Model Independent Mode
+    isMIMode = false
 //    applicationId = "com.fosung.lighthouse"
-    appversionCode = 3000
-    appversionName = "3.0.0.0"
+    appversionCode = 3006
+    appversionName = "3.0.0.6"
 
     versionNamePrefixT = "_T_V"
     versionNamePrefixY = "_Y_V"

commonbiz/bizfxzteachercomm/build.gradle

@@ -1,6 +1,4 @@
-plugins {
-    id 'com.android.library'
-}
+apply plugin: 'com.android.library'
 apply from: '../../assemble_dolast.gradle'
 apply from: './../../commonlibs2.gradle'
 def librarys = rootProject.ext.dependencies

commonlibs/baselibrary/build.gradle

@@ -1,15 +1,13 @@
-plugins {
-    id 'com.android.library'
-}
+apply plugin: 'com.android.library'
 apply from: './../../commonlibs1.gradle'
 def librarys = rootProject.ext.dependencies //依赖
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':commonlibs:common:libutils')
-    api project(':commonlibs:common:libbase')
+//    api project(':commonlibs:common:libutils')
+    implementation project(':commonlibs:common:libbase')
     // 网络请求
-    api project(':commonlibs:common:libmvp')
-    api project(':commonlibs:common:libretrofit')
+//    api project(':commonlibs:common:libmvp')
+//    api project(':commonlibs:common:libretrofit')
     // app升级
     api project(':commonlibs:hunheku:libupdateapputilsold')
     // https://github.com/teprinciple/UpdateAppUtils
@@ -69,10 +67,8 @@ dependencies {
     api project(':commonlibs:hunheku:libyanzhenjieandpermission')
     // https://github.com/yshrsmz/KeyboardVisibilityEvent
     api 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.3.0'
-    // https://github.com/getActivity/ToastUtils
-    api 'com.github.getActivity:ToastUtils:9.2'
     // https://github.com/li-xiaojun/XPopup
-    api 'com.github.li-xiaojun:XPopup:2.3.4'
+    api project(':commonlibs:yewulibs:slbxpopup')
     // https://github.com/meetsl/SCardView-master
     api 'io.github.meetsl:SCardView:1.2'
     // https://github.com/nanchen2251/BankCardUtils

commonlibs/baselibrary/src/main/AndroidManifest.xml

@@ -635,6 +635,13 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".switchbutton.MainActivitySwitchButtonK" />
         </activity>
+        <activity android:name=".choutipop.ChoutiActivity">
+            <intent-filter>
+                <action android:name="${applicationId}.hs.act.ChoutiActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <receiver android:name=".networkview.NetworkChangeListener" />
 

commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/changelanguage/ChangeLanActivity.java

@@ -7,6 +7,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.geek.libutils.app.LocalManageUtil;
 import com.haier.cellarette.baselibrary.R;
 
 public class ChangeLanActivity extends AppCompatActivity {

commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/choutipop/ChoutiActivity.java

@@ -0,0 +1,164 @@
+package com.haier.cellarette.baselibrary.choutipop;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.haier.cellarette.baselibrary.R;
+
+import java.util.ArrayList;
+
+public class ChoutiActivity extends AppCompatActivity {
+
+    private ScrollLayout mScrollLayout;
+    private ScrollRecyclerView mScrollRecyclerView;
+    private ScrollTextView mScrollTextView;
+    private ImageView mMap;
+    private RelativeLayout mTitle;
+    private Button mNews;
+    private Button mVideo;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_mainchouti);
+        initView();
+    }
+
+    private void initView() {
+        mTitle = findViewById(R.id.title);
+        mMap = findViewById(R.id.map);
+        mScrollLayout = findViewById(R.id.scroll_layout);
+        mScrollLayout.setHeights(600);
+        mScrollRecyclerView = findViewById(R.id.scroll_list);
+        mScrollTextView = findViewById(R.id.scroll_bottom);
+        mNews = findViewById(R.id.news);
+        mVideo = findViewById(R.id.video);
+
+        initRecyclerViewData();
+        initClick();
+        mTitle.setBackgroundColor(Color.argb(0, 63, 81, 181));
+        mScrollLayout.setBackgroundColor(Color.argb(0, 0, 0, 0));
+    }
+
+    private void initRecyclerViewData() {
+        ArrayList<String> list = new ArrayList<>();
+        for (int i = 0; i < 30; i++) {
+            list.add("我是：" + i);
+        }
+        mScrollRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        MyAdapter adapter = new MyAdapter(this, list);
+        mScrollRecyclerView.setAdapter(adapter);
+    }
+
+    private void initClick() {
+        mScrollLayout.setOnScrollChangedListener(new ScrollLayout.OnScrollChangedListener() {
+            @Override
+            public void onScrollChange(int status) {
+                scrollLayouChange(status);
+            }
+
+            @Override
+            public void onScrollProgress(int progress) {
+                if (progress > 0) {
+                    mTitle.setVisibility(View.VISIBLE);
+                } else {
+                    mTitle.setVisibility(View.INVISIBLE);
+                }
+                mTitle.setBackgroundColor(Color.argb(progress, 63, 81, 181));
+                mScrollLayout.setBackgroundColor(Color.argb(progress, 0, 0, 0));
+            }
+        });
+
+
+        mScrollTextView.setOnTextViewListener(new ScrollTextView.OnTextViewListener() {
+            @Override
+            public void onClick(View v) {
+                mScrollLayout.toggle(ScrollLayout.STATUS_DEFAULT);
+            }
+        });
+
+        mMap.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(ChoutiActivity.this, "地图", Toast.LENGTH_SHORT).show();
+            }
+        });
+
+        mNews.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(ChoutiActivity.this, "新闻", Toast.LENGTH_SHORT).show();
+            }
+        });
+        mVideo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(ChoutiActivity.this, "视频", Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
+    private void scrollLayouChange(int status) {
+        mScrollTextView.setVisibility(status == ScrollLayout.STATUS_CLOSE
+                ? View.VISIBLE : View.GONE);
+    }
+
+    class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
+
+        private Context mContext;
+        private ArrayList<String> mList;
+        private LayoutInflater mInflater;
+
+        public MyAdapter(Context context, ArrayList<String> list) {
+            this.mContext = context;
+            this.mList = list;
+            mInflater = LayoutInflater.from(context);
+        }
+
+        @Override
+        public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = mInflater.inflate(R.layout.item_recyclerviewchouti, parent, false);//可以
+            return new MyViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(MyViewHolder holder, @SuppressLint("RecyclerView") final int position) {
+            holder.mTv.setText(mList.get(position));
+            holder.mTv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(mContext, "this is " + position, Toast.LENGTH_SHORT).show();
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList.size();
+        }
+
+        public class MyViewHolder extends RecyclerView.ViewHolder {
+            private TextView mTv;
+
+            public MyViewHolder(View itemView) {
+                super(itemView);
+                mTv = itemView.findViewById(R.id.tv);
+            }
+        }
+    }
+}