urlList = new ArrayList<>();
+ for (Uri uri : uriList) {
+ urlList.add(uri.toString());
+ }
+ ImagePreview.getInstance()
+ .setContext(BigImageViewPagerAct.this)
+ .setImageList(urlList)
+ .setShowDownButton(false)
+ .setShowCloseButton(false)
+ .setEnableDragClose(true)
+ .setEnableClickClose(false)
+ .start();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/emptyview/NiubiEmptyView.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/emptyview/NiubiEmptyView.java
index 1f4041d3..29dbb2a2 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/emptyview/NiubiEmptyView.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/emptyview/NiubiEmptyView.java
@@ -30,7 +30,7 @@ public NiubiEmptyView bind(Context context, View mRecyclerView, BaseQuickAdapter
this.context = context;
this.mAdapter = mAdapter;
// loadingView = ((Activity) context).getLayoutInflater().inflate(R.layout.activity_recycleviewallsuses_demo8_viewloading, (ViewGroup) mRecyclerView.getParent(), false);
- loadingView = ((Activity) context).getLayoutInflater().inflate(R.layout.activity_network_loading, (ViewGroup) mRecyclerView.getParent(), false);
+ loadingView = ((Activity) context).getLayoutInflater().inflate(R.layout.activity_network_loading1, (ViewGroup) mRecyclerView.getParent(), false);
loadingView_content = loadingView.findViewById(R.id.loading_notice);
imageView = loadingView.findViewById(R.id.loading_iv);
noDataView = ((Activity) context).getLayoutInflater().inflate(R.layout.activity_recycleviewallsuses_demo8_viewnodata, (ViewGroup) mRecyclerView.getParent(), false);
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ExpandableTextViewAct.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ExpandableTextViewAct.java
new file mode 100644
index 00000000..8f68050d
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ExpandableTextViewAct.java
@@ -0,0 +1,281 @@
+package com.haier.cellarette.baselibrary.expandabletextview;
+
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.text.util.LinkifyCompat;
+
+import com.ctetin.expandabletextviewlibrary.ExpandableTextView;
+import com.ctetin.expandabletextviewlibrary.app.LinkType;
+import com.ctetin.expandabletextviewlibrary.app.StatusType;
+import com.haier.cellarette.baselibrary.R;
+
+
+/**
+ * 联系我：
+ * 792075058@qq.com
+ *
+ * 博客地址：
+ * https://www.jianshu.com/p/b7a8ddc639db
+ *
+ * Github地址(您的star是对我最大的鼓励)：
+ * https://github.com/MZCretin/ExpandableTextView
+ */
+public class ExpandableTextViewAct extends AppCompatActivity {
+ private ExpandableTextView[] views;
+ private TextView[] tips;
+ private String[] indexs = new String[]{
+ "3,5;6,9;10,12",
+ "3,5;6,11;12,13;21,22;27,28",
+ "2,6;7,12;13,14;22,23",
+ "3,5;6,9;10,11;19,20",
+ "3,5;6,9;10,11;19,21",
+ "3,5;6,9;10,11;14,16",
+ "3,5;6,9;10,11;14,15;20,21",
+ "3,5;6,9;10,11;14,16;21,22",
+ "3,5;6,9;10,11;14,15;20,21",
+ "4,6;7,10;11,12;15,16;21,22",
+ "4,6;7,10;11,12;15,16;24,29;40,45"
+ };
+
+ private TextView tvTips00;
+
+ private ExpandableTextView.OnLinkClickListener linkClickListener = (type, content, selfContent) -> {
+ if (type.equals(LinkType.LINK_TYPE)) {
+ Toast.makeText(ExpandableTextViewAct.this, "你点击了链接 内容是：" + content, Toast.LENGTH_SHORT).show();
+ } else if (type.equals(LinkType.MENTION_TYPE)) {
+ Toast.makeText(ExpandableTextViewAct.this, "你点击了@用户 内容是：" + content, Toast.LENGTH_SHORT).show();
+ } else if (type.equals(LinkType.SELF)) {
+ Toast.makeText(ExpandableTextViewAct.this, "你点击了自定义规则 内容是：" + content + " " + selfContent, Toast.LENGTH_SHORT).show();
+ }
+ };
+
+ private void initView() {
+ views = new ExpandableTextView[12];
+ tips = new TextView[11];
+ views[0] = findViewById(R.id.ep_01);
+ views[1] = findViewById(R.id.ep_02);
+ views[2] = findViewById(R.id.ep_03);
+ views[3] = findViewById(R.id.ep_04);
+ views[4] = findViewById(R.id.ep_05);
+ views[5] = findViewById(R.id.ep_06);
+ views[6] = findViewById(R.id.ep_07);
+ views[7] = findViewById(R.id.ep_08);
+ views[8] = findViewById(R.id.ep_09);
+ views[9] = findViewById(R.id.ep_10);
+ views[10] = findViewById(R.id.ep_11);
+ views[11] = findViewById(R.id.ep_12);
+ tips[0] = findViewById(R.id.tv_tips01);
+ tips[1] = findViewById(R.id.tv_tips02);
+ tips[2] = findViewById(R.id.tv_tips03);
+ tips[3] = findViewById(R.id.tv_tips04);
+ tips[4] = findViewById(R.id.tv_tips05);
+ tips[5] = findViewById(R.id.tv_tips06);
+ tips[6] = findViewById(R.id.tv_tips07);
+ tips[7] = findViewById(R.id.tv_tips08);
+ tips[8] = findViewById(R.id.tv_tips09);
+ tips[9] = findViewById(R.id.tv_tips10);
+ tips[10] = findViewById(R.id.tv_tips11);
+ tvTips00 = findViewById(R.id.tv_tips00);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_expandabletextview);
+
+ initView();
+
+ setTips();
+ String yourText = " 我所认识的中国，http://www.baidu.com 强大、友好 --习大大。@奥特曼 “一带一路”经济带带动了沿线国家的经济发展，促进我国与他国的友好往来和贸易发展，可谓“双赢”，Github地址。 自古以来，中国以和平、友好的面孔示人。汉武帝派张骞出使西域，开辟丝绸之路，增进与西域各国的友好往来。http://www.baidu.com 胡麻、胡豆、香料等食材也随之传入中国，汇集于中华美食。@RNG 漠漠古道，驼铃阵阵，这条路奠定了“一带一路”的基础，让世界认识了中国。";
+// String yourText = "1、哈哈\n2、哈哈\n3、哈哈\n4、哈哈\n5、哈哈\n6、哈哈\n7、哈哈\n8、哈哈\n9、哈哈\n1、哈哈";
+// String yourText = "1\n2考虑\n3考虑\n4考虑\n5考虑\n6考虑";
+
+ setContent(yourText, true);
+
+ //在RecyclerView中查看效果
+ findViewById(R.id.ll_recyclerview).setOnClickListener(v -> {
+ startActivity(new Intent(this, ShowInRecyclerViewActivity.class));
+ });
+
+ //广告 从后台到app都是我自己一个人开发的 希望得到你的支持
+ findViewById(R.id.ll_ad).setOnClickListener(v -> {
+ Uri uri = Uri.parse("http://a.app.qq.com/o/simple.jsp?pkgname=com.cretin");
+ Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+ startActivity(intent);
+ });
+ }
+
+ /**
+ * 设置内容
+ *
+ * @param yourText
+ * @param d
+ */
+ private void setContent(String yourText, boolean d) {
+ //1、正常带链接和@用户，没有展开和收回功能
+ views[0].setContent(yourText);
+ views[0].setLinkClickListener(linkClickListener);
+
+ //2、正常带链接，不带@用户，有展开和收回功能，有切换动画
+ views[1].setContent(yourText);
+ views[1].setLinkClickListener(linkClickListener);
+ views[11].setContent(yourText);
+ views[11].setLinkClickListener(linkClickListener);
+ //添加展开和收回操作
+ views[1].setExpandOrContractClickListener(type -> {
+ if (type.equals(StatusType.STATUS_CONTRACT)) {
+ Toast.makeText(ExpandableTextViewAct.this, "收回操作", Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(ExpandableTextViewAct.this, "展开操作", Toast.LENGTH_SHORT).show();
+ }
+ });
+ //添加展开和收回操作 只触发点击 不真正触发展开和收回操作
+ views[11].setExpandOrContractClickListener(type -> {
+ if (type.equals(StatusType.STATUS_CONTRACT)) {
+ Toast.makeText(ExpandableTextViewAct.this, "收回操作，不真正触发收回操作", Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(ExpandableTextViewAct.this, "展开操作，不真正触发展开操作", Toast.LENGTH_SHORT).show();
+ }
+ }, false);
+
+ //3、正常不带链接，不带@用户，有展开和收回功能，有切换动画
+ views[2].setContent(yourText);
+ views[2].setLinkClickListener(linkClickListener);
+
+ //4、正常带链接和@用户，有展开和收回功能，有切换动画
+ views[3].setContent(yourText);
+ views[3].setLinkClickListener(linkClickListener);
+ views[3].setNeedSelf(true);
+
+ //5、正常带链接和@用户，有展开和收回功能，没有切换动画
+ views[4].setContent(yourText);
+ views[4].setLinkClickListener(linkClickListener);
+
+ //6、正常带链接和@用户，有展开，没有收回功能
+ views[5].setContent(yourText);
+ views[5].setLinkClickListener(linkClickListener);
+
+ //7、正常带链接和@用户，有展开，有收回功能，带附加内容(比如时间)
+ views[6].setContent(yourText);
+ views[6].setEndExpendContent(" 1小时前");
+ views[6].setLinkClickListener(linkClickListener);
+
+ //8、正常带链接和@用户，有展开，没有收回功能，带附加内容(比如时间)
+ views[7].setContent(yourText);
+ views[7].setEndExpendContent(" 1小时前");
+ views[7].setLinkClickListener(linkClickListener);
+
+ //9、正常带链接和@用户，有展开，有收回功能，有'展开'和'收起'始终靠右显示的功能
+ views[8].setContent(yourText);
+ views[8].setLinkClickListener(linkClickListener);
+ //需要先开启始终靠右显示的功能
+ views[8].setNeedAlwaysShowRight(true);
+
+ //10、正常带链接和@用户，有展开，有收回功能，带自定义规则（解析[标题](规则)并处理，例如对一些字段进行自定义处理，比如文字中的"--习大大" 和 "Gitbub地址"）
+ //如果你需要对一些字段进行自定义处理，比如文字中的"--习大大" 和 "Gitbub地址"，你需要按照下面的形式去组装数据，这样控件就可以自动去解析并展示。
+ /**
+ * 如需使用此功能，需要先开启
+ * app:ep_need_self="true"
+ * views[8].setNeedSelf(true);
+ */
+ String yourText1 = "";
+ if (d) {
+ yourText1 = " 我所认识的中国，强大、友好，[--习大大](schema_jump_userinfo)。[http://www.baidu.com](http://www.baidu.com)，@奥特曼 “一带一路”经济带带动了沿线国家的经济发展，促进我国与他国的友好往来和贸易发展，可谓“双赢”，[Github地址](https://github.com/MZCretin/ExpandableTextView)。http://www.baidu.com 自古以来，中国以和平、友好的面孔示人。汉武帝派张骞出使西域，开辟丝绸之路，增进与西域各国的友好往来。http://www.baidu.com 胡麻、胡豆、香料等食材也随之传入中国，汇集于中华美食。@RNG 漠漠古道，驼铃阵阵，这条路奠定了“一带一路”的基础，让世界认识了中国。";
+ } else {
+ tips[9].setText("10、正常带链接和@用户，有展开，有收回功能，带自定义规则");
+ yourText1 = yourText;
+ setTips();
+ }
+ views[9].setContent(yourText1);
+ views[9].setLinkClickListener(linkClickListener);
+ //需要先开启
+ views[9].setNeedSelf(true);
+
+ //11、正常带链接和@用户，有展开，有收回功能，文本中链接不转换成网页链接的文本提示
+ views[10].setContent(yourText);
+ views[10].setLinkClickListener(linkClickListener);
+ //监听是否初始化完成 在这里可以获取是否支持展开/收回
+ views[10].setOnGetLineCountListener(new ExpandableTextView.OnGetLineCountListener() {
+ @Override
+ public void onGetLineCount(int lineCount, boolean canExpand) {
+ Toast.makeText(ExpandableTextViewAct.this, "行数：" + lineCount + " 是否满足展开条件：" + canExpand, Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+
+ /**
+ * 设置tips
+ */
+ private void setTips() {
+ //处理最上边的Tips
+ final SpannableString value = SpannableString.valueOf(tvTips00.getText());
+ LinkifyCompat.addLinks(value, Linkify.ALL);
+ tvTips00.setMovementMethod(LinkMovementMethod.getInstance());
+ tvTips00.setText(value);
+
+ //处理剩下的
+ for (int i = 0; i < indexs.length; i++) {
+ String index = indexs[i];
+ TextView view = tips[i];
+ String[] split = index.split(";");
+ SpannableStringBuilder spannableStringBuilder =
+ new SpannableStringBuilder(view.getText());
+ for (String s :
+ split) {
+ int x = Integer.parseInt(s.split(",")[0]) + 2;
+ int y = Integer.parseInt(s.split(",")[1]) + 2;
+ spannableStringBuilder.setSpan(
+ new ForegroundColorSpan(Color.parseColor("#FF6200")),
+ x, y, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ }
+ view.setText(spannableStringBuilder);
+ }
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_layout, menu);
+ return super.onCreateOptionsMenu(menu);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ View view = LayoutInflater.from(this).inflate(R.layout.dialog_input, null);
+ new AlertDialog.Builder(this)
+ .setMessage("请输入将要替换的内容:")
+ .setTitle("提示")
+ .setView(view)
+ .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+ .setPositiveButton("确定", (dialog, which) -> {
+ EditText editText = view.findViewById(R.id.ed_content);
+ String string = editText.getText().toString();
+ if (TextUtils.isEmpty(string)) {
+ Toast.makeText(this, "内容不能为空", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ setContent(string, false);
+ dialog.dismiss();
+ })
+ .show();
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ShowInRecyclerViewActivity.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ShowInRecyclerViewActivity.java
new file mode 100644
index 00000000..da1ebf7e
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ShowInRecyclerViewActivity.java
@@ -0,0 +1,172 @@
+package com.haier.cellarette.baselibrary.expandabletextview;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ctetin.expandabletextviewlibrary.ExpandableTextView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.haier.cellarette.baselibrary.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShowInRecyclerViewActivity extends AppCompatActivity {
+ private RecyclerView recyclerView;
+ private MyRecyclerViewAdapter adapter;
+ private List list;
+
+ private FloatingActionButton floatingActionButton;
+
+ //是需要保存展开或收回状态
+ private boolean flag = true;
+ private String content;
+
+ private String yourText = "我所认识的中国，强大、友好我所认识的中国，强大、友好。@奥特曼 “一带一路”经济带带动了沿线国家的经济发展，促进我国与他国的友好往来和贸易发展，可谓“双赢”。http://www.baidu.com 自古以来，中国以和平、友好的面孔示人。汉武帝派张骞出使西域，开辟丝绸之路，增进与西域各国的友好往来。http://www.baidu.com 胡麻、胡豆、香料等食材也随之传入中国，汇集于中华美食。@RNG 漠漠古道，驼铃阵阵，这条路奠定了“一带一路”的基础，让世界认识了中国。";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_show_in_recycler_view);
+
+ recyclerView = findViewById(R.id.recyclerview);
+ floatingActionButton = findViewById(R.id.float_btn);
+
+ list = new ArrayList<>();
+ changeStateAndSetData(null, false);
+
+ floatingActionButton.setOnClickListener(v -> changeStateAndSetData(content, true));
+ }
+
+ /**
+ * 切换状态
+ */
+ private void changeStateAndSetData(String content, boolean change) {
+ if (change)
+ flag = !flag;
+ list.clear();
+ if (flag) {
+ Toast.makeText(this, "保留之前的展开或收回状态", Toast.LENGTH_SHORT).show();
+ floatingActionButton.setImageResource(R.mipmap.green);
+ for (int i = 0; i < 50; i++) {
+ if (TextUtils.isEmpty(content))
+ list.add(new ViewModelWithFlag("第" + (i + 1) + "条数据：" + yourText));
+ else
+ list.add(new ViewModelWithFlag("第" + (i + 1) + "条数据：" + content));
+ }
+ } else {
+ Toast.makeText(this, "不保留之前的展开或收回状态", Toast.LENGTH_SHORT).show();
+ floatingActionButton.setImageResource(R.mipmap.gray);
+ for (int i = 0; i < 50; i++) {
+ if (TextUtils.isEmpty(content))
+ list.add(new ViewModel("第" + (i + 1) + "条数据：" + yourText));
+ else
+ list.add(new ViewModel("第" + (i + 1) + "条数据：" + content));
+ }
+ }
+ adapter = new MyRecyclerViewAdapter(this, list);
+ recyclerView.setLayoutManager(new LinearLayoutManager(this));
+ recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+ recyclerView.setAdapter(adapter);
+ adapter.notifyDataSetChanged();
+ }
+
+
+ public class MyRecyclerViewAdapter extends RecyclerView.Adapter {
+ private Context mContext;
+ private List dataList;
+
+ public MyRecyclerViewAdapter(Context context, List list) {
+ this.mContext = context;
+ this.dataList = list;
+ }
+
+ @Override
+ public RecyclerHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(mContext).inflate(R.layout.item_text, parent, false);
+ return new RecyclerHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(RecyclerHolder holder, int position) {
+ if (flag) {
+ //注意：保留状态需要在设置内容之前调用bind方法
+ holder.textView.bind((ViewModelWithFlag) list.get(position));
+ holder.textView.setContent(((ViewModelWithFlag) list.get(position)).getTitle());
+ } else {
+ holder.textView.setContent(((ViewModel) list.get(position)).getTitle());
+ }
+ holder.textView.setLinkClickListener((type, content, selfContent) -> {
+ switch (type) {
+ case LINK_TYPE:
+ Toast.makeText(mContext, "点击链接：" + content, Toast.LENGTH_SHORT).show();
+ break;
+ case MENTION_TYPE:
+ Toast.makeText(mContext, "点击用户：" + content, Toast.LENGTH_SHORT).show();
+ break;
+ case SELF:
+ Toast.makeText(mContext, "你点击了自定义规则 内容是：" + content + " " + selfContent, Toast.LENGTH_SHORT).show();
+ break;
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return dataList.size();
+ }
+
+ class RecyclerHolder extends RecyclerView.ViewHolder {
+ private ExpandableTextView textView;
+
+ private RecyclerHolder(View itemView) {
+ super(itemView);
+ textView = itemView.findViewById(R.id.tv_item);
+ itemView.setOnClickListener(v -> Toast.makeText(
+ ShowInRecyclerViewActivity.this, "您点击了第" + getLayoutPosition() + "个Item", Toast.LENGTH_SHORT).show());
+ }
+ }
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_layout, menu);
+ return super.onCreateOptionsMenu(menu);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ View view = LayoutInflater.from(this).inflate(R.layout.dialog_input, null);
+ new AlertDialog.Builder(this)
+ .setMessage("请输入将要替换的内容:")
+ .setTitle("提示")
+ .setView(view)
+ .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+ .setPositiveButton("确定", (dialog, which) -> {
+ EditText editText = view.findViewById(R.id.ed_content);
+ String string = editText.getText().toString();
+ if (TextUtils.isEmpty(string)) {
+ Toast.makeText(this, "内容不能为空", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ content = string;
+ changeStateAndSetData(string, false);
+ dialog.dismiss();
+ })
+ .show();
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModel.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModel.java
new file mode 100644
index 00000000..e2e13d96
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModel.java
@@ -0,0 +1,23 @@
+package com.haier.cellarette.baselibrary.expandabletextview;
+
+/**
+ * @date: on 2018/9/20
+ * @author: cretin
+ * @email: mxnzp_life@163.com
+ * @desc: ViewModel 不需要记住之前的状态
+ */
+public class ViewModel {
+ private String title;
+
+ public ViewModel(String title) {
+ this.title = title;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModelWithFlag.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModelWithFlag.java
new file mode 100644
index 00000000..b6875bdf
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/expandabletextview/ViewModelWithFlag.java
@@ -0,0 +1,44 @@
+package com.haier.cellarette.baselibrary.expandabletextview;
+
+import com.ctetin.expandabletextviewlibrary.app.StatusType;
+import com.ctetin.expandabletextviewlibrary.model.ExpandableStatusFix;
+
+/**
+ * @date: on 2018/9/20
+ * @author: cretin
+ * @email: mxnzp_life@163.com
+ * @desc: 如果你需要在滑动的时候保持之前的展开或者收起的状态
+ * 则
+ * 一、实现 ExpandableStatusFix
+ * 二、在你的model中定义一个
+ * private StatusType status;
+ * 三、实现对应的方法，将你刚刚定义的status返回，
+ * 四、并在给ExpandableTextView设置内容之前，调用bind方法
+ */
+public class ViewModelWithFlag implements ExpandableStatusFix {
+ private StatusType status;
+
+ public ViewModelWithFlag(String title) {
+ this.title = title;
+ }
+
+ private String title;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Override
+ public void setStatus(StatusType status) {
+ this.status = status;
+ }
+
+ @Override
+ public StatusType getStatus() {
+ return status;
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/MarqueeView.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/MarqueeView.java
index df61f7e6..5b31c241 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/MarqueeView.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/MarqueeView.java
@@ -7,7 +7,6 @@
import android.view.animation.Animation;
import android.widget.ViewFlipper;
-
import androidx.annotation.AnimRes;
import androidx.annotation.Nullable;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexItemEntity.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexItemEntity.java
new file mode 100644
index 00000000..f568f9e4
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexItemEntity.java
@@ -0,0 +1,51 @@
+package com.haier.cellarette.baselibrary.marqueelibrary.ui;
+
+/**
+ * Created by GongWen on 16/12/27.
+ */
+
+public class ComplexItemEntity {
+
+ private String title;
+ private String secondTitle;
+ private String time;
+
+ public ComplexItemEntity(String title, String secondTitle, String time) {
+ this.title = title;
+ this.secondTitle = secondTitle;
+ this.time = time;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getSecondTitle() {
+ return secondTitle;
+ }
+
+ public void setSecondTitle(String secondTitle) {
+ this.secondTitle = secondTitle;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ @Override
+ public String toString() {
+ return "{" +
+ "title='" + title + '\'' +
+ ", secondTitle='" + secondTitle + '\'' +
+ ", time='" + time + '\'' +
+ '}';
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexViewMF.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexViewMF.java
new file mode 100644
index 00000000..b2a64246
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/ComplexViewMF.java
@@ -0,0 +1,28 @@
+package com.haier.cellarette.baselibrary.marqueelibrary.ui;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.haier.cellarette.baselibrary.R;
+import com.haier.cellarette.baselibrary.marqueelibrary.MarqueeFactory;
+
+
+public class ComplexViewMF extends MarqueeFactory {
+ private LayoutInflater inflater;
+
+ public ComplexViewMF(Context mContext) {
+ super(mContext);
+ inflater = LayoutInflater.from(mContext);
+ }
+
+ @Override
+ public RelativeLayout generateMarqueeItemView(ComplexItemEntity data) {
+ RelativeLayout mView = (RelativeLayout) inflater.inflate(R.layout.complex_view, null);
+ ((TextView) mView.findViewById(R.id.title)).setText(data.getTitle());
+ ((TextView) mView.findViewById(R.id.secondTitle)).setText(data.getSecondTitle());
+ ((TextView) mView.findViewById(R.id.time)).setText(data.getTime());
+ return mView;
+ }
+}
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/MarqueeViewLibraryAct.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/MarqueeViewLibraryAct.java
new file mode 100644
index 00000000..0025a8ca
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/MarqueeViewLibraryAct.java
@@ -0,0 +1,160 @@
+package com.haier.cellarette.baselibrary.marqueelibrary.ui;
+
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import com.haier.cellarette.baselibrary.R;
+import com.haier.cellarette.baselibrary.marqueelibrary.MarqueeFactory;
+import com.haier.cellarette.baselibrary.marqueelibrary.MarqueeView;
+import com.haier.cellarette.baselibrary.marqueelibrary.SimpleMF;
+import com.haier.cellarette.baselibrary.marqueelibrary.SimpleMarqueeView;
+import com.haier.cellarette.baselibrary.marqueelibrary.util.OnItemClickListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+public class MarqueeViewLibraryAct extends AppCompatActivity {
+ private final List datas = Arrays.asList("《赋得古原草送别》", "离离原上草，一岁一枯荣。", "野火烧不尽，春风吹又生。", "远芳侵古道，晴翠接荒城。", "又送王孙去，萋萋满别情。", "测试测试测试测试测试测试测试测试测试测试测试");
+ private SimpleMarqueeView marqueeView1, marqueeView2, marqueeView5, marqueeView6;
+ private SimpleMarqueeView marqueeView3;
+ private ImageView yellowSpeaker;
+ private MarqueeView marqueeView4;
+
+ private WeakHandler mHandler = new WeakHandler();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_marqueeviewlibrary);
+ marqueeView1 = findViewById(R.id.marqueeView1);
+ marqueeView2 = findViewById(R.id.marqueeView2);
+ marqueeView3 = findViewById(R.id.marqueeView3);
+ yellowSpeaker = findViewById(R.id.yellowSpeaker);
+ marqueeView4 = findViewById(R.id.marqueeView4);
+ marqueeView5 = findViewById(R.id.marqueeView5);
+ marqueeView6 = findViewById(R.id.marqueeView6);
+ DrawableCompat.setTint(DrawableCompat.wrap(yellowSpeaker.getDrawable().mutate()), getResources().getColor(R.color.yellow));
+
+ initMarqueeView1();
+ initMarqueeView2();
+ initMarqueeView3();
+ initMarqueeView4();
+ initMarqueeView5();
+ initMarqueeView6();
+ }
+
+ private void initMarqueeView1() {
+ SimpleMF marqueeFactory = new SimpleMF(MarqueeViewLibraryAct.this);
+ marqueeFactory.setData(datas);
+ marqueeView1.setMarqueeFactory(marqueeFactory);
+ marqueeView1.startFlipping();
+ marqueeView1.setOnItemClickListener(onSimpleItemClickListener);
+ }
+
+ private void initMarqueeView2() {
+ SimpleMF marqueeFactory2 = new SimpleMF(MarqueeViewLibraryAct.this);
+ marqueeFactory2.setData(datas);
+ marqueeView2.setMarqueeFactory(marqueeFactory2);
+ marqueeView2.startFlipping();
+ marqueeView2.setOnItemClickListener(onSimpleItemClickListener);
+ }
+
+ private void initMarqueeView3() {
+ SimpleMF marqueeFactory3 = new SimpleMF<>(MarqueeViewLibraryAct.this);
+ List datas3 = new ArrayList<>();
+ datas3.add(Html.fromHtml("《赋得古原草送别》"));
+ datas3.add(Html.fromHtml("离离原上草，一岁一枯荣。"));
+ datas3.add(Html.fromHtml("野火烧不尽，春风吹又生。"));
+ datas3.add(Html.fromHtml("远芳侵古道，晴翠接荒城。"));
+ datas3.add(Html.fromHtml("又送王孙去，萋萋满别情。"));
+ marqueeFactory3.setData(datas3);
+ marqueeView3.setMarqueeFactory(marqueeFactory3);
+ marqueeView3.startFlipping();
+ marqueeView3.setOnItemClickListener(new OnItemClickListener() {
+ @Override
+ public void onItemClickListener(TextView mView, Spanned mData, int mPosition) {
+ Toast.makeText(MarqueeViewLibraryAct.this, String.format("mPosition:%s,mData:%s,mView:%s,.", mPosition, mData, mView), Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+
+ private void initMarqueeView4() {
+ List complexDatas = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ complexDatas.add(new ComplexItemEntity("标题 " + i, "副标题 " + i, "时间 " + i));
+ }
+ MarqueeFactory marqueeFactory = new ComplexViewMF(MarqueeViewLibraryAct.this);
+
+ marqueeFactory.setData(complexDatas);
+ marqueeView4.setOnItemClickListener(new OnItemClickListener() {
+ @Override
+ public void onItemClickListener(RelativeLayout mView, ComplexItemEntity mData, int mPosition) {
+ Toast.makeText(MarqueeViewLibraryAct.this, String.format("mPosition:%s,mData:%s,mView:%s,.", mPosition, mData, mView), Toast.LENGTH_SHORT).show();
+ }
+ });
+ marqueeView4.setInAndOutAnim(R.anim.in_top, R.anim.out_bottom);
+ marqueeView4.setMarqueeFactory(marqueeFactory);
+ marqueeView4.startFlipping();
+ }
+
+ private void initMarqueeView5() {
+ SimpleMF marqueeFactory = new SimpleMF(this);
+ marqueeFactory.setData(datas);
+ marqueeView5.setOnItemClickListener(onSimpleItemClickListener);
+ marqueeView5.setMarqueeFactory(marqueeFactory);
+ marqueeView5.startFlipping();
+ }
+
+ private void initMarqueeView6() {
+ final SimpleMF marqueeFactory = new SimpleMF<>(this);
+ marqueeFactory.setData(datas);
+ marqueeView6.setOnItemClickListener(onSimpleItemClickListener);
+ marqueeView6.setMarqueeFactory(marqueeFactory);
+ marqueeView6.startFlipping();
+
+ //测试重置数据效果
+ mHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ Random random = new Random();
+ int delayMillis = (random.nextInt(5) + 4) * 1000;
+ marqueeFactory.setData(datas);
+ mHandler.postDelayed(this, delayMillis);
+ }
+ }, 8000);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ marqueeView1.startFlipping();
+ marqueeView2.startFlipping();
+ marqueeView3.startFlipping();
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ marqueeView1.stopFlipping();
+ marqueeView2.stopFlipping();
+ marqueeView3.stopFlipping();
+ }
+
+ private OnItemClickListener onSimpleItemClickListener = new OnItemClickListener() {
+ @Override
+ public void onItemClickListener(TextView mView, String mData, int mPosition) {
+ Toast.makeText(MarqueeViewLibraryAct.this, String.format("mPosition:%s,mData:%s,mView:%s,.", mPosition, mData, mView), Toast.LENGTH_SHORT).show();
+ }
+ };
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/WeakHandler.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/WeakHandler.java
new file mode 100644
index 00000000..9fcf8e72
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/marqueelibrary/ui/WeakHandler.java
@@ -0,0 +1,518 @@
+/*
+ * Copyright (c) 2014 Badoo Trading Limited
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Portions of documentation in this code are modifications based on work created and
+ * shared by Android Open Source Project and used according to terms described in the
+ * Apache License, Version 2.0
+ */
+package com.haier.cellarette.baselibrary.marqueelibrary.ui;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import java.lang.ref.WeakReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Memory safer implementation of android.os.Handler
+ *
+ * Original implementation of Handlers always keeps hard reference to handler in queue of execution.
+ * If you create anonymous handler and post delayed message into it, it will keep all parent class
+ * for that time in memory even if it could be cleaned.
+ *
+ * This implementation is trickier, it will keep WeakReferences to runnables and messages,
+ * and GC could collect them once WeakHandler instance is not referenced any more
+ *
+ *
+ * @see Handler
+ *
+ * Created by Dmytro Voronkevych on 17/06/2014.
+ */
+@SuppressWarnings("unused")
+public class WeakHandler {
+ private final Handler.Callback mCallback; // hard reference to Callback. We need to keep callback in memory
+ private final ExecHandler mExec;
+ private Lock mLock = new ReentrantLock();
+ @SuppressWarnings("ConstantConditions")
+ @VisibleForTesting
+ final ChainedRef mRunnables = new ChainedRef(mLock, null);
+
+ /**
+ * Default constructor associates this handler with the {@link Looper} for the
+ * current thread.
+ *
+ * If this thread does not have a looper, this handler won't be able to receive messages
+ * so an exception is thrown.
+ */
+ public WeakHandler() {
+ mCallback = null;
+ mExec = new ExecHandler();
+ }
+
+ /**
+ * Constructor associates this handler with the {@link Looper} for the
+ * current thread and takes a callback interface in which you can handle
+ * messages.
+ *
+ * If this thread does not have a looper, this handler won't be able to receive messages
+ * so an exception is thrown.
+ *
+ * @param callback The callback interface in which to handle messages, or null.
+ */
+ public WeakHandler(@Nullable Handler.Callback callback) {
+ mCallback = callback; // Hard referencing body
+ mExec = new ExecHandler(new WeakReference<>(callback)); // Weak referencing inside ExecHandler
+ }
+
+ /**
+ * Use the provided {@link Looper} instead of the default one.
+ *
+ * @param looper The looper, must not be null.
+ */
+ public WeakHandler(@NonNull Looper looper) {
+ mCallback = null;
+ mExec = new ExecHandler(looper);
+ }
+
+ /**
+ * Use the provided {@link Looper} instead of the default one and take a callback
+ * interface in which to handle messages.
+ *
+ * @param looper The looper, must not be null.
+ * @param callback The callback interface in which to handle messages, or null.
+ */
+ public WeakHandler(@NonNull Looper looper, @NonNull Handler.Callback callback) {
+ mCallback = callback;
+ mExec = new ExecHandler(looper, new WeakReference<>(callback));
+ }
+
+ /**
+ * Causes the Runnable r to be added to the message queue.
+ * The runnable will be run on the thread to which this handler is
+ * attached.
+ *
+ * @param r The Runnable that will be executed.
+ *
+ * @return Returns true if the Runnable was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean post(@NonNull Runnable r) {
+ return mExec.post(wrapRunnable(r));
+ }
+
+ /**
+ * Causes the Runnable r to be added to the message queue, to be run
+ * at a specific time given by uptimeMillis.
+ * The time-base is {@link android.os.SystemClock#uptimeMillis}.
+ * The runnable will be run on the thread to which this handler is attached.
+ *
+ * @param r The Runnable that will be executed.
+ * @param uptimeMillis The absolute time at which the callback should run,
+ * using the {@link android.os.SystemClock#uptimeMillis} time-base.
+ *
+ * @return Returns true if the Runnable was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting. Note that a
+ * result of true does not mean the Runnable will be processed -- if
+ * the looper is quit before the delivery time of the message
+ * occurs then the message will be dropped.
+ */
+ public final boolean postAtTime(@NonNull Runnable r, long uptimeMillis) {
+ return mExec.postAtTime(wrapRunnable(r), uptimeMillis);
+ }
+
+ /**
+ * Causes the Runnable r to be added to the message queue, to be run
+ * at a specific time given by uptimeMillis.
+ * The time-base is {@link android.os.SystemClock#uptimeMillis}.
+ * The runnable will be run on the thread to which this handler is attached.
+ *
+ * @param r The Runnable that will be executed.
+ * @param uptimeMillis The absolute time at which the callback should run,
+ * using the {@link android.os.SystemClock#uptimeMillis} time-base.
+ *
+ * @return Returns true if the Runnable was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting. Note that a
+ * result of true does not mean the Runnable will be processed -- if
+ * the looper is quit before the delivery time of the message
+ * occurs then the message will be dropped.
+ *
+ * @see android.os.SystemClock#uptimeMillis
+ */
+ public final boolean postAtTime(Runnable r, Object token, long uptimeMillis) {
+ return mExec.postAtTime(wrapRunnable(r), token, uptimeMillis);
+ }
+
+ /**
+ * Causes the Runnable r to be added to the message queue, to be run
+ * after the specified amount of time elapses.
+ * The runnable will be run on the thread to which this handler
+ * is attached.
+ *
+ * @param r The Runnable that will be executed.
+ * @param delayMillis The delay (in milliseconds) until the Runnable
+ * will be executed.
+ *
+ * @return Returns true if the Runnable was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting. Note that a
+ * result of true does not mean the Runnable will be processed --
+ * if the looper is quit before the delivery time of the message
+ * occurs then the message will be dropped.
+ */
+ public final boolean postDelayed(Runnable r, long delayMillis) {
+ return mExec.postDelayed(wrapRunnable(r), delayMillis);
+ }
+
+ /**
+ * Posts a message to an object that implements Runnable.
+ * Causes the Runnable r to executed on the next iteration through the
+ * message queue. The runnable will be run on the thread to which this
+ * handler is attached.
+ * This method is only for use in very special circumstances -- it
+ * can easily starve the message queue, cause ordering problems, or have
+ * other unexpected side-effects.
+ *
+ * @param r The Runnable that will be executed.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean postAtFrontOfQueue(Runnable r) {
+ return mExec.postAtFrontOfQueue(wrapRunnable(r));
+ }
+
+ /**
+ * Remove any pending posts of Runnable r that are in the message queue.
+ */
+ public final void removeCallbacks(Runnable r) {
+ final WeakRunnable runnable = mRunnables.remove(r);
+ if (runnable != null) {
+ mExec.removeCallbacks(runnable);
+ }
+ }
+
+ /**
+ * Remove any pending posts of Runnable r with Object
+ * token that are in the message queue. If token is null,
+ * all callbacks will be removed.
+ */
+ public final void removeCallbacks(Runnable r, Object token) {
+ final WeakRunnable runnable = mRunnables.remove(r);
+ if (runnable != null) {
+ mExec.removeCallbacks(runnable, token);
+ }
+ }
+
+ /**
+ * Pushes a message onto the end of the message queue after all pending messages
+ * before the current time. It will be received in callback,
+ * in the thread attached to this handler.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean sendMessage(Message msg) {
+ return mExec.sendMessage(msg);
+ }
+
+ /**
+ * Sends a Message containing only the what value.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean sendEmptyMessage(int what) {
+ return mExec.sendEmptyMessage(what);
+ }
+
+ /**
+ * Sends a Message containing only the what value, to be delivered
+ * after the specified amount of time elapses.
+ * @see #sendMessageDelayed(Message, long)
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean sendEmptyMessageDelayed(int what, long delayMillis) {
+ return mExec.sendEmptyMessageDelayed(what, delayMillis);
+ }
+
+ /**
+ * Sends a Message containing only the what value, to be delivered
+ * at a specific time.
+ * @see #sendMessageAtTime(Message, long)
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean sendEmptyMessageAtTime(int what, long uptimeMillis) {
+ return mExec.sendEmptyMessageAtTime(what, uptimeMillis);
+ }
+
+ /**
+ * Enqueue a message into the message queue after all pending messages
+ * before (current time + delayMillis). You will receive it in
+ * callback, in the thread attached to this handler.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting. Note that a
+ * result of true does not mean the message will be processed -- if
+ * the looper is quit before the delivery time of the message
+ * occurs then the message will be dropped.
+ */
+ public final boolean sendMessageDelayed(Message msg, long delayMillis) {
+ return mExec.sendMessageDelayed(msg, delayMillis);
+ }
+
+ /**
+ * Enqueue a message into the message queue after all pending messages
+ * before the absolute time (in milliseconds) uptimeMillis.
+ * The time-base is {@link android.os.SystemClock#uptimeMillis}.
+ * You will receive it in callback, in the thread attached
+ * to this handler.
+ *
+ * @param uptimeMillis The absolute time at which the message should be
+ * delivered, using the
+ * {@link android.os.SystemClock#uptimeMillis} time-base.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting. Note that a
+ * result of true does not mean the message will be processed -- if
+ * the looper is quit before the delivery time of the message
+ * occurs then the message will be dropped.
+ */
+ public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
+ return mExec.sendMessageAtTime(msg, uptimeMillis);
+ }
+
+ /**
+ * Enqueue a message at the front of the message queue, to be processed on
+ * the next iteration of the message loop. You will receive it in
+ * callback, in the thread attached to this handler.
+ * This method is only for use in very special circumstances -- it
+ * can easily starve the message queue, cause ordering problems, or have
+ * other unexpected side-effects.
+ *
+ * @return Returns true if the message was successfully placed in to the
+ * message queue. Returns false on failure, usually because the
+ * looper processing the message queue is exiting.
+ */
+ public final boolean sendMessageAtFrontOfQueue(Message msg) {
+ return mExec.sendMessageAtFrontOfQueue(msg);
+ }
+
+ /**
+ * Remove any pending posts of messages with code 'what' that are in the
+ * message queue.
+ */
+ public final void removeMessages(int what) {
+ mExec.removeMessages(what);
+ }
+
+ /**
+ * Remove any pending posts of messages with code 'what' and whose obj is
+ * 'object' that are in the message queue. If object is null,
+ * all messages will be removed.
+ */
+ public final void removeMessages(int what, Object object) {
+ mExec.removeMessages(what, object);
+ }
+
+ /**
+ * Remove any pending posts of callbacks and sent messages whose
+ * obj is token. If token is null,
+ * all callbacks and messages will be removed.
+ */
+ public final void removeCallbacksAndMessages(Object token) {
+ mExec.removeCallbacksAndMessages(token);
+ }
+
+ /**
+ * Check if there are any pending posts of messages with code 'what' in
+ * the message queue.
+ */
+ public final boolean hasMessages(int what) {
+ return mExec.hasMessages(what);
+ }
+
+ /**
+ * Check if there are any pending posts of messages with code 'what' and
+ * whose obj is 'object' in the message queue.
+ */
+ public final boolean hasMessages(int what, Object object) {
+ return mExec.hasMessages(what, object);
+ }
+
+ public final Looper getLooper() {
+ return mExec.getLooper();
+ }
+
+ private WeakRunnable wrapRunnable(@NonNull Runnable r) {
+ //noinspection ConstantConditions
+ if (r == null) {
+ throw new NullPointerException("Runnable can't be null");
+ }
+ final ChainedRef hardRef = new ChainedRef(mLock, r);
+ mRunnables.insertAfter(hardRef);
+ return hardRef.wrapper;
+ }
+
+ private static class ExecHandler extends Handler {
+ private final WeakReference mCallback;
+
+ ExecHandler() {
+ mCallback = null;
+ }
+
+ ExecHandler(WeakReference callback) {
+ mCallback = callback;
+ }
+
+ ExecHandler(Looper looper) {
+ super(looper);
+ mCallback = null;
+ }
+
+ ExecHandler(Looper looper, WeakReference callback) {
+ super(looper);
+ mCallback = callback;
+ }
+
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ if (mCallback == null) {
+ return;
+ }
+ final Callback callback = mCallback.get();
+ if (callback == null) { // Already disposed
+ return;
+ }
+ callback.handleMessage(msg);
+ }
+ }
+
+ static class WeakRunnable implements Runnable {
+ private final WeakReference mDelegate;
+ private final WeakReference mReference;
+
+ WeakRunnable(WeakReference delegate, WeakReference reference) {
+ mDelegate = delegate;
+ mReference = reference;
+ }
+
+ @Override
+ public void run() {
+ final Runnable delegate = mDelegate.get();
+ final ChainedRef reference = mReference.get();
+ if (reference != null) {
+ reference.remove();
+ }
+ if (delegate != null) {
+ delegate.run();
+ }
+ }
+ }
+
+ static class ChainedRef {
+ @Nullable
+ ChainedRef next;
+ @Nullable
+ ChainedRef prev;
+ @NonNull
+ final Runnable runnable;
+ @NonNull
+ final WeakRunnable wrapper;
+
+ @NonNull
+ Lock lock;
+
+ public ChainedRef(@NonNull Lock lock, @NonNull Runnable r) {
+ this.runnable = r;
+ this.lock = lock;
+ this.wrapper = new WeakRunnable(new WeakReference<>(r), new WeakReference<>(this));
+ }
+
+ public WeakRunnable remove() {
+ lock.lock();
+ try {
+ if (prev != null) {
+ prev.next = next;
+ }
+ if (next != null) {
+ next.prev = prev;
+ }
+ prev = null;
+ next = null;
+ } finally {
+ lock.unlock();
+ }
+ return wrapper;
+ }
+
+ public void insertAfter(@NonNull ChainedRef candidate) {
+ lock.lock();
+ try {
+ if (this.next != null) {
+ this.next.prev = candidate;
+ }
+
+ candidate.next = this.next;
+ this.next = candidate;
+ candidate.prev = this;
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Nullable
+ public WeakRunnable remove(Runnable obj) {
+ lock.lock();
+ try {
+ ChainedRef curr = this.next; // Skipping head
+ while (curr != null) {
+ if (curr.runnable == obj) { // We do comparison exactly how Handler does inside
+ return curr.remove();
+ }
+ curr = curr.next;
+ }
+ } finally {
+ lock.unlock();
+ }
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetModel.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetModel.java
index 99ffde3c..473f62e8 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetModel.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetModel.java
@@ -97,7 +97,7 @@ public void initReceiver(Context context) {
public static void showWifiDlg(final Context context) {
AlertDialog.Builder builder = new AlertDialog.Builder(context.getApplicationContext());
if (mWifiDialog == null) {
- mWifiDialog = builder.setIcon(R.drawable.smartbar_home_icon) //
+ mWifiDialog = builder.setIcon(R.drawable.icon_download_new) //
.setTitle("wifi设置") //
.setMessage("当前无网络").setPositiveButton("设置", new DialogInterface
.OnClickListener() {
@@ -138,7 +138,7 @@ public void onClick(DialogInterface dialog, int which) {
public static void showNoNetWorkDlg(final Context context) {
AlertDialog.Builder builder = new AlertDialog.Builder(context.getApplicationContext());
if (mAlertDialog == null) {
- mAlertDialog = builder.setIcon(R.drawable.smartbar_home_icon) //
+ mAlertDialog = builder.setIcon(R.drawable.icon_download_new) //
.setTitle("网络设置") //
.setMessage("当前无网络").setPositiveButton("设置", new DialogInterface
.OnClickListener() {
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetStateUtils.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetStateUtils.java
index 269875e1..ae1c3997 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetStateUtils.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/networkview/NetStateUtils.java
@@ -1,6 +1,7 @@
package com.haier.cellarette.baselibrary.networkview;
import android.Manifest;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.content.pm.PackageManager;
import android.location.LocationManager;
@@ -68,6 +69,7 @@ public static boolean is2G(Context context) {
/**
* wifi是否打开
*/
+ @SuppressLint("MissingPermission")
public static boolean isWifiEnabled(Context context) {
ConnectivityManager mgrConn = (ConnectivityManager) context
.getSystemService(Context.CONNECTIVITY_SERVICE);
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/ConvertUtil.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/ConvertUtil.java
similarity index 94%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/ConvertUtil.java
rename to commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/ConvertUtil.java
index 37d43798..00752e27 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/ConvertUtil.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/ConvertUtil.java
@@ -1,4 +1,4 @@
-package com.example.slbappcomm.ratingstarview;
+package com.haier.cellarette.baselibrary.ratingstarview;
import android.text.TextUtils;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/PingfenMainActivity.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/PingfenMainActivity.java
new file mode 100644
index 00000000..655e5049
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/PingfenMainActivity.java
@@ -0,0 +1,22 @@
+package com.haier.cellarette.baselibrary.ratingstarview;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.haier.cellarette.baselibrary.R;
+
+// https://github.com/everhad/AndroidRatingStar
+// api 'com.github.everhad:AndroidRatingStar:v1.0.4'
+
+public class PingfenMainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_pingfen);
+
+ RatingStarView rsv_rating = (RatingStarView) findViewById(R.id.rsv_rating);
+ rsv_rating.setRating(1.5f);
+ }
+}
\ No newline at end of file
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/RatingStarView.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/RatingStarView.java
similarity index 99%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/RatingStarView.java
rename to commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/RatingStarView.java
index 3a3a5fab..fc260e00 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/RatingStarView.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/RatingStarView.java
@@ -1,4 +1,4 @@
-package com.example.slbappcomm.ratingstarview;
+package com.haier.cellarette.baselibrary.ratingstarview;
import android.content.Context;
import android.content.res.TypedArray;
@@ -13,7 +13,7 @@
import android.view.MotionEvent;
import android.view.View;
-import com.example.slbappcomm.R;
+import com.haier.cellarette.baselibrary.R;
import java.util.ArrayList;
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/StarModel.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/StarModel.java
similarity index 99%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/StarModel.java
rename to commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/StarModel.java
index 5fe00112..cf01adf8 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/StarModel.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/StarModel.java
@@ -1,4 +1,4 @@
-package com.example.slbappcomm.ratingstarview;
+package com.haier.cellarette.baselibrary.ratingstarview;
import android.graphics.RectF;
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/VertexF.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/VertexF.java
similarity index 80%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/VertexF.java
rename to commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/VertexF.java
index 934ad7a2..72ecb766 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/ratingstarview/VertexF.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/ratingstarview/VertexF.java
@@ -1,4 +1,4 @@
-package com.example.slbappcomm.ratingstarview;
+package com.haier.cellarette.baselibrary.ratingstarview;
/**
* Created by hxw on 2017-04-23.
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewalluses/demo4baseadpterhelp/hunhe/adapter/BaseRecActDemo41Adapter.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewalluses/demo4baseadpterhelp/hunhe/adapter/BaseRecActDemo41Adapter.java
index 69ed0bc1..0269c7f5 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewalluses/demo4baseadpterhelp/hunhe/adapter/BaseRecActDemo41Adapter.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewalluses/demo4baseadpterhelp/hunhe/adapter/BaseRecActDemo41Adapter.java
@@ -74,7 +74,7 @@ protected void convert(BaseViewHolder helper, BaseRecActDemo41Bean item) {
break;
case BaseRecActDemo41Bean.style4:
final RecyclerView mRecyclerView = helper.getView(R.id.rvlist);
- mRecyclerView.setLayoutManager(new GridLayoutManager(helper.itemView.getContext(), 1, OrientationHelper.HORIZONTAL, false));
+ mRecyclerView.setLayoutManager(new GridLayoutManager(helper.itemView.getContext(), 1, RecyclerView.HORIZONTAL, false));
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setOnFlingListener(null);
mLinearSnapHelper = new LinearSnapHelper();
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6ItemDecoration.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6ItemDecoration.java
index ca0a49e9..0168ce49 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6ItemDecoration.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6ItemDecoration.java
@@ -1,7 +1,7 @@
package com.haier.cellarette.baselibrary.recycleviewmultitype.viewholders.demo6;
import android.graphics.Rect;
-//import android.support.annotation.NonNull;
+//
//import androidx.appcompat.widget.GridLayoutManager.SpanSizeLookup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6footerHorizontalBinder.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6footerHorizontalBinder.java
index 4ae6ce1b..fd77b0e3 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6footerHorizontalBinder.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewmultitype/viewholders/demo6/ItemDemo6footerHorizontalBinder.java
@@ -1,6 +1,6 @@
package com.haier.cellarette.baselibrary.recycleviewmultitype.viewholders.demo6;
-//import android.support.annotation.NonNull;
+//
//import androidx.appcompat.widget.LinearLayoutManager;
//import androidx.appcompat.widget.LinearSnapHelper;
//import androidx.appcompat.widget.OrientationHelper;
@@ -56,7 +56,7 @@ public ViewHolder(View itemView) {
super(itemView);
recyclerView = itemView.findViewById(R.id.list1);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(itemView.getContext());
- linearLayoutManager.setOrientation(OrientationHelper.HORIZONTAL);
+ linearLayoutManager.setOrientation(RecyclerView.HORIZONTAL);
recyclerView.setLayoutManager(linearLayoutManager);
new LinearSnapHelper().attachToRecyclerView(recyclerView);
adapter = new ItemDemo6footerAdapter();
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewutils/JackSnapHelper.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewutils/JackSnapHelper.java
index b991b863..9d6ccdfb 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewutils/JackSnapHelper.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/recycleviewutils/JackSnapHelper.java
@@ -1,7 +1,7 @@
package com.haier.cellarette.baselibrary.recycleviewutils;
-//import android.support.annotation.NonNull;
-//import android.support.annotation.Nullable;
+//
+//
//import androidx.appcompat.widget.LinearLayoutManager;
//import androidx.appcompat.widget.LinearSnapHelper;
//import androidx.appcompat.widget.OrientationHelper;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct.java
new file mode 100644
index 00000000..00180571
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct.java
@@ -0,0 +1,36 @@
+package com.haier.cellarette.baselibrary.scardview;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.haier.cellarette.baselibrary.R;
+
+public class SCardViewAct extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_scardview);
+ findViewById(R.id.btn1).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(SCardViewAct.this, SCardViewAct1.class));
+ }
+ });
+ findViewById(R.id.btn2).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(SCardViewAct.this, SCardViewAct2.class));
+ }
+ });
+ findViewById(R.id.btn3).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(SCardViewAct.this, SCardViewAct3.class));
+ }
+ });
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct1.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct1.java
new file mode 100644
index 00000000..d38f8d05
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct1.java
@@ -0,0 +1,19 @@
+package com.haier.cellarette.baselibrary.scardview;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.haier.cellarette.baselibrary.R;
+
+public class SCardViewAct1 extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_scardview1);
+
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct2.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct2.java
new file mode 100644
index 00000000..23fd2322
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct2.java
@@ -0,0 +1,19 @@
+package com.haier.cellarette.baselibrary.scardview;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.haier.cellarette.baselibrary.R;
+
+public class SCardViewAct2 extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_scardview2);
+
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct3.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct3.java
new file mode 100644
index 00000000..f8a75da7
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scardview/SCardViewAct3.java
@@ -0,0 +1,18 @@
+package com.haier.cellarette.baselibrary.scardview;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.haier.cellarette.baselibrary.R;
+
+public class SCardViewAct3 extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_scardview3);
+ }
+}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scrollview/ScrollViewAct.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scrollview/ScrollViewAct.java
index 8f17c8b1..92df893c 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scrollview/ScrollViewAct.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/scrollview/ScrollViewAct.java
@@ -1,7 +1,7 @@
package com.haier.cellarette.baselibrary.scrollview;
import android.os.Bundle;
-//import android.support.annotation.Nullable;
+//
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shoppingcar/ShoppingCarActivity.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shoppingcar/ShoppingCarActivity.java
index cae063e6..29a5c854 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shoppingcar/ShoppingCarActivity.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shoppingcar/ShoppingCarActivity.java
@@ -1,7 +1,7 @@
package com.haier.cellarette.baselibrary.shoppingcar;
import android.os.Bundle;
-//import android.support.annotation.Nullable;
+//
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/huxiview/BreathingViewHelper.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shuaxinviewanimation/BreathingViewHelper.java
similarity index 99%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/huxiview/BreathingViewHelper.java
rename to commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shuaxinviewanimation/BreathingViewHelper.java
index c5844b7d..43412524 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/huxiview/BreathingViewHelper.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/shuaxinviewanimation/BreathingViewHelper.java
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package com.example.slbappcomm.huxiview;
+package com.haier.cellarette.baselibrary.shuaxinviewanimation;
import android.graphics.Color;
import android.os.AsyncTask;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/size/SizeUtils.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/size/SizeUtils.java
deleted file mode 100644
index e02d0a04..00000000
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/size/SizeUtils.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.haier.cellarette.baselibrary.size;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- *
- * author: Jeffery.L
- * time : 2016/8/2
- * desc : 尺寸相关工具类
- *
- */
-public final class SizeUtils {
-
- private SizeUtils() {
- throw new UnsupportedOperationException("u can't fuck me...");
- }
-
- /**
- * dp转px
- *
- * @param dpValue dp值
- * @return px值
- */
- public static int dp2px(Context context, float dpValue) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return (int) (dpValue * scale + 0.5f);
- }
-
- /**
- * px转dp
- *
- * @param pxValue px值
- * @return dp值
- */
- public static int px2dp(Context context,float pxValue) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return (int) (pxValue / scale + 0.5f);
- }
-
- /**
- * sp转px
- *
- * @param spValue sp值
- * @return px值
- */
- public static int sp2px(Context context,float spValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (spValue * fontScale + 0.5f);
- }
-
- /**
- * px转sp
- *
- * @param pxValue px值
- * @return sp值
- */
- public static int px2sp(Context context,float pxValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (pxValue / fontScale + 0.5f);
- }
-
- /**
- * 各种单位转换
- * 该方法存在于TypedValue
- *
- * @param unit 单位
- * @param value 值
- * @param metrics DisplayMetrics
- * @return 转换结果
- */
- public static float applyDimension(int unit, float value, DisplayMetrics metrics) {
- switch (unit) {
- case TypedValue.COMPLEX_UNIT_PX:
- return value;
- case TypedValue.COMPLEX_UNIT_DIP:
- return value * metrics.density;
- case TypedValue.COMPLEX_UNIT_SP:
- return value * metrics.scaledDensity;
- case TypedValue.COMPLEX_UNIT_PT:
- return value * metrics.xdpi * (1.0f / 72);
- case TypedValue.COMPLEX_UNIT_IN:
- return value * metrics.xdpi;
- case TypedValue.COMPLEX_UNIT_MM:
- return value * metrics.xdpi * (1.0f / 25.4f);
- }
- return 0;
- }
-
- /**
- * 在onCreate中获取视图的尺寸
- * 需回调onGetSizeListener接口，在onGetSize中获取view宽高
- * 用法示例如下所示
- *
- * SizeUtils.forceGetViewSize(view, new SizeUtils.onGetSizeListener() {
- * Override
- * public void onGetSize(View view) {
- * view.getWidth();
- * }
- * });
- *
- *
- * @param view 视图
- * @param listener 监听器
- */
- public static void forceGetViewSize(final View view, final onGetSizeListener listener) {
- view.post(new Runnable() {
- @Override
- public void run() {
- if (listener != null) {
- listener.onGetSize(view);
- }
- }
- });
- }
-
- /**
- * 获取到View尺寸的监听
- */
- public interface onGetSizeListener {
- void onGetSize(View view);
- }
-
- /**
- * 测量视图尺寸
- *
- * @param view 视图
- * @return arr[0]: 视图宽度, arr[1]: 视图高度
- */
- public static int[] measureView(View view) {
- ViewGroup.LayoutParams lp = view.getLayoutParams();
- if (lp == null) {
- lp = new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT
- );
- }
- int widthSpec = ViewGroup.getChildMeasureSpec(0, 0, lp.width);
- int lpHeight = lp.height;
- int heightSpec;
- if (lpHeight > 0) {
- heightSpec = View.MeasureSpec.makeMeasureSpec(lpHeight, View.MeasureSpec.EXACTLY);
- } else {
- heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
- }
- view.measure(widthSpec, heightSpec);
- return new int[]{view.getMeasuredWidth(), view.getMeasuredHeight()};
- }
-
- /**
- * 获取测量视图宽度
- *
- * @param view 视图
- * @return 视图宽度
- */
- public static int getMeasuredWidth(View view) {
- return measureView(view)[0];
- }
-
- /**
- * 获取测量视图高度
- *
- * @param view 视图
- * @return 视图高度
- */
- public static int getMeasuredHeight(View view) {
- return measureView(view)[1];
- }
-}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/splash/AlphaView.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/splash/AlphaView.java
index 7f267ce7..f3284071 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/splash/AlphaView.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/splash/AlphaView.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.content.res.TypedArray;
-//import android.support.annotation.Nullable;
+//
//import androidx.core.view.PagerAdapter;
import androidx.annotation.Nullable;
//import androidx.core.view.ViewPager;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtil.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtil.java
deleted file mode 100644
index defffe8d..00000000
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtil.java
+++ /dev/null
@@ -1,738 +0,0 @@
-package com.haier.cellarette.baselibrary.statusbar;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-//import android.support.annotation.ColorInt;
-//import android.support.annotation.IntRange;
-//import android.support.annotation.NonNull;
-//import androidx.coordinatorlayout.widget.CoordinatorLayout;
-//import androidx.core.widget.DrawerLayout;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.IntRange;
-import androidx.annotation.NonNull;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.drawerlayout.widget.DrawerLayout;
-
-import com.haier.cellarette.baselibrary.R;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Created by Jaeger on 16/2/14.
- *
- * Email: chjie.jaeger@gmail.com
- * GitHub: https://github.com/laobie
- */
-public class StatusBarUtil {
-
- public static final int DEFAULT_STATUS_BAR_ALPHA = 112;
- private static final int FAKE_STATUS_BAR_VIEW_ID = R.id.statusbarutil_fake_status_bar_view;
- private static final int FAKE_TRANSLUCENT_VIEW_ID = R.id.statusbarutil_translucent_view;
- private static final int TAG_KEY_HAVE_SET_OFFSET = -123;
-
- /**
- * 设置状态栏颜色
- *
- * @param activity 需要设置的 activity
- * @param color 状态栏颜色值
- */
- public static void setColor(Activity activity, @ColorInt int color) {
- setColor(activity, color, DEFAULT_STATUS_BAR_ALPHA);
- }
-
- /**
- * 设置状态栏颜色
- *
- * @param activity 需要设置的activity
- * @param color 状态栏颜色值
- * @param statusBarAlpha 状态栏透明度
- */
-
- public static void setColor(Activity activity, @ColorInt int color, @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- activity.getWindow().setStatusBarColor(calculateStatusColor(color, statusBarAlpha));
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
- View fakeStatusBarView = decorView.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- if (fakeStatusBarView.getVisibility() == View.GONE) {
- fakeStatusBarView.setVisibility(View.VISIBLE);
- }
- fakeStatusBarView.setBackgroundColor(calculateStatusColor(color, statusBarAlpha));
- } else {
- decorView.addView(createStatusBarView(activity, color, statusBarAlpha));
- }
- setRootView(activity);
- }
- }
-
- /**
- * 为滑动返回界面设置状态栏颜色
- *
- * @param activity 需要设置的activity
- * @param color 状态栏颜色值
- */
- public static void setColorForSwipeBack(Activity activity, int color) {
- setColorForSwipeBack(activity, color, DEFAULT_STATUS_BAR_ALPHA);
- }
-
- /**
- * 为滑动返回界面设置状态栏颜色
- *
- * @param activity 需要设置的activity
- * @param color 状态栏颜色值
- * @param statusBarAlpha 状态栏透明度
- */
- public static void setColorForSwipeBack(Activity activity, @ColorInt int color,
- @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-
- ViewGroup contentView = activity.findViewById(android.R.id.content);
- View rootView = contentView.getChildAt(0);
- int statusBarHeight = getStatusBarHeight(activity);
- if (rootView != null && rootView instanceof CoordinatorLayout) {
- final CoordinatorLayout coordinatorLayout = (CoordinatorLayout) rootView;
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- coordinatorLayout.setFitsSystemWindows(false);
- contentView.setBackgroundColor(calculateStatusColor(color, statusBarAlpha));
- boolean isNeedRequestLayout = contentView.getPaddingTop() < statusBarHeight;
- if (isNeedRequestLayout) {
- contentView.setPadding(0, statusBarHeight, 0, 0);
- coordinatorLayout.post(new Runnable() {
- @Override
- public void run() {
- coordinatorLayout.requestLayout();
- }
- });
- }
- } else {
- coordinatorLayout.setStatusBarBackgroundColor(calculateStatusColor(color, statusBarAlpha));
- }
- } else {
- contentView.setPadding(0, statusBarHeight, 0, 0);
- contentView.setBackgroundColor(calculateStatusColor(color, statusBarAlpha));
- }
- setTransparentForWindow(activity);
- }
- }
-
- /**
- * 设置状态栏纯色 不加半透明效果
- *
- * @param activity 需要设置的 activity
- * @param color 状态栏颜色值
- */
- public static void setColorNoTranslucent(Activity activity, @ColorInt int color) {
- setColor(activity, color, 0);
- }
-
- /**
- * 设置状态栏颜色(5.0以下无半透明效果,不建议使用)
- *
- * @param activity 需要设置的 activity
- * @param color 状态栏颜色值
- */
- @Deprecated
- public static void setColorDiff(Activity activity, @ColorInt int color) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- transparentStatusBar(activity);
- ViewGroup contentView = activity.findViewById(android.R.id.content);
- // 移除半透明矩形,以免叠加
- View fakeStatusBarView = contentView.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- if (fakeStatusBarView.getVisibility() == View.GONE) {
- fakeStatusBarView.setVisibility(View.VISIBLE);
- }
- fakeStatusBarView.setBackgroundColor(color);
- } else {
- contentView.addView(createStatusBarView(activity, color));
- }
- setRootView(activity);
- }
-
- /**
- * 使状态栏半透明
- *
- * 适用于图片作为背景的界面,此时需要图片填充到状态栏
- *
- * @param activity 需要设置的activity
- */
- public static void setTranslucent(Activity activity) {
- setTranslucent(activity, DEFAULT_STATUS_BAR_ALPHA);
- }
-
- /**
- * 使状态栏半透明
- *
- * 适用于图片作为背景的界面,此时需要图片填充到状态栏
- *
- * @param activity 需要设置的activity
- * @param statusBarAlpha 状态栏透明度
- */
- public static void setTranslucent(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- setTransparent(activity);
- addTranslucentView(activity, statusBarAlpha);
- }
-
- /**
- * 针对根布局是 CoordinatorLayout, 使状态栏半透明
- *
- * 适用于图片作为背景的界面,此时需要图片填充到状态栏
- *
- * @param activity 需要设置的activity
- * @param statusBarAlpha 状态栏透明度
- */
- public static void setTranslucentForCoordinatorLayout(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- transparentStatusBar(activity);
- addTranslucentView(activity, statusBarAlpha);
- }
-
- /**
- * 设置状态栏全透明
- *
- * @param activity 需要设置的activity
- */
- public static void setTransparent(Activity activity) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- transparentStatusBar(activity);
- setRootView(activity);
- }
-
- /**
- * 使状态栏透明(5.0以上半透明效果,不建议使用)
- *
- * 适用于图片作为背景的界面,此时需要图片填充到状态栏
- *
- * @param activity 需要设置的activity
- */
- @Deprecated
- public static void setTranslucentDiff(Activity activity) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- // 设置状态栏透明
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- setRootView(activity);
- }
- }
-
- /**
- * 为DrawerLayout 布局设置状态栏变色
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- * @param color 状态栏颜色值
- */
- public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
- setColorForDrawerLayout(activity, drawerLayout, color, DEFAULT_STATUS_BAR_ALPHA);
- }
-
- /**
- * 为DrawerLayout 布局设置状态栏颜色,纯色
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- * @param color 状态栏颜色值
- */
- public static void setColorNoTranslucentForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
- setColorForDrawerLayout(activity, drawerLayout, color, 0);
- }
-
- /**
- * 为DrawerLayout 布局设置状态栏变色
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- * @param color 状态栏颜色值
- * @param statusBarAlpha 状态栏透明度
- */
- public static void setColorForDrawerLayout(Activity activity, DrawerLayout drawerLayout, @ColorInt int color,
- @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
- } else {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
- // 生成一个状态栏大小的矩形
- // 添加 statusBarView 到布局中
- ViewGroup contentLayout = (ViewGroup) drawerLayout.getChildAt(0);
- View fakeStatusBarView = contentLayout.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- if (fakeStatusBarView.getVisibility() == View.GONE) {
- fakeStatusBarView.setVisibility(View.VISIBLE);
- }
- fakeStatusBarView.setBackgroundColor(color);
- } else {
- contentLayout.addView(createStatusBarView(activity, color), 0);
- }
- // 内容布局不是 LinearLayout 时,设置padding top
- if (!(contentLayout instanceof LinearLayout) && contentLayout.getChildAt(1) != null) {
- contentLayout.getChildAt(1)
- .setPadding(contentLayout.getPaddingLeft(), getStatusBarHeight(activity) + contentLayout.getPaddingTop(),
- contentLayout.getPaddingRight(), contentLayout.getPaddingBottom());
- }
- // 设置属性
- setDrawerLayoutProperty(drawerLayout, contentLayout);
- addTranslucentView(activity, statusBarAlpha);
- }
-
- /**
- * 设置 DrawerLayout 属性
- *
- * @param drawerLayout DrawerLayout
- * @param drawerLayoutContentLayout DrawerLayout 的内容布局
- */
- private static void setDrawerLayoutProperty(DrawerLayout drawerLayout, ViewGroup drawerLayoutContentLayout) {
- ViewGroup drawer = (ViewGroup) drawerLayout.getChildAt(1);
- drawerLayout.setFitsSystemWindows(false);
- drawerLayoutContentLayout.setFitsSystemWindows(false);
- drawerLayoutContentLayout.setClipToPadding(true);
- drawer.setFitsSystemWindows(false);
- }
-
- /**
- * 为DrawerLayout 布局设置状态栏变色(5.0以下无半透明效果,不建议使用)
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- * @param color 状态栏颜色值
- */
- @Deprecated
- public static void setColorForDrawerLayoutDiff(Activity activity, DrawerLayout drawerLayout, @ColorInt int color) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- // 生成一个状态栏大小的矩形
- ViewGroup contentLayout = (ViewGroup) drawerLayout.getChildAt(0);
- View fakeStatusBarView = contentLayout.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- if (fakeStatusBarView.getVisibility() == View.GONE) {
- fakeStatusBarView.setVisibility(View.VISIBLE);
- }
- fakeStatusBarView.setBackgroundColor(calculateStatusColor(color, DEFAULT_STATUS_BAR_ALPHA));
- } else {
- // 添加 statusBarView 到布局中
- contentLayout.addView(createStatusBarView(activity, color), 0);
- }
- // 内容布局不是 LinearLayout 时,设置padding top
- if (!(contentLayout instanceof LinearLayout) && contentLayout.getChildAt(1) != null) {
- contentLayout.getChildAt(1).setPadding(0, getStatusBarHeight(activity), 0, 0);
- }
- // 设置属性
- setDrawerLayoutProperty(drawerLayout, contentLayout);
- }
- }
-
- /**
- * 为 DrawerLayout 布局设置状态栏透明
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- */
- public static void setTranslucentForDrawerLayout(Activity activity, DrawerLayout drawerLayout) {
- setTranslucentForDrawerLayout(activity, drawerLayout, DEFAULT_STATUS_BAR_ALPHA);
- }
-
- /**
- * 为 DrawerLayout 布局设置状态栏透明
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- */
- public static void setTranslucentForDrawerLayout(Activity activity, DrawerLayout drawerLayout,
- @IntRange(from = 0, to = 255) int statusBarAlpha) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- setTransparentForDrawerLayout(activity, drawerLayout);
- addTranslucentView(activity, statusBarAlpha);
- }
-
- /**
- * 为 DrawerLayout 布局设置状态栏透明
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- */
- public static void setTransparentForDrawerLayout(Activity activity, DrawerLayout drawerLayout) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
- } else {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
-
- ViewGroup contentLayout = (ViewGroup) drawerLayout.getChildAt(0);
- // 内容布局不是 LinearLayout 时,设置padding top
- if (!(contentLayout instanceof LinearLayout) && contentLayout.getChildAt(1) != null) {
- contentLayout.getChildAt(1).setPadding(0, getStatusBarHeight(activity), 0, 0);
- }
-
- // 设置属性
- setDrawerLayoutProperty(drawerLayout, contentLayout);
- }
-
- /**
- * 为 DrawerLayout 布局设置状态栏透明(5.0以上半透明效果,不建议使用)
- *
- * @param activity 需要设置的activity
- * @param drawerLayout DrawerLayout
- */
- @Deprecated
- public static void setTranslucentForDrawerLayoutDiff(Activity activity, DrawerLayout drawerLayout) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- // 设置状态栏透明
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- // 设置内容布局属性
- ViewGroup contentLayout = (ViewGroup) drawerLayout.getChildAt(0);
- contentLayout.setFitsSystemWindows(true);
- contentLayout.setClipToPadding(true);
- // 设置抽屉布局属性
- ViewGroup vg = (ViewGroup) drawerLayout.getChildAt(1);
- vg.setFitsSystemWindows(false);
- // 设置 DrawerLayout 属性
- drawerLayout.setFitsSystemWindows(false);
- }
- }
-
- /**
- * 为头部是 ImageView 的界面设置状态栏全透明
- *
- * @param activity 需要设置的activity
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTransparentForImageView(Activity activity, View needOffsetView) {
- setTranslucentForImageView(activity, 0, needOffsetView);
- }
-
- /**
- * 为头部是 ImageView 的界面设置状态栏透明(使用默认透明度)
- *
- * @param activity 需要设置的activity
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTranslucentForImageView(Activity activity, View needOffsetView) {
- setTranslucentForImageView(activity, DEFAULT_STATUS_BAR_ALPHA, needOffsetView);
- }
-
- /**
- * 为头部是 ImageView 的界面设置状态栏透明
- *
- * @param activity 需要设置的activity
- * @param statusBarAlpha 状态栏透明度
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTranslucentForImageView(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha,
- View needOffsetView) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
- return;
- }
- setTransparentForWindow(activity);
- addTranslucentView(activity, statusBarAlpha);
- if (needOffsetView != null) {
- Object haveSetOffset = needOffsetView.getTag(TAG_KEY_HAVE_SET_OFFSET);
- if (haveSetOffset != null && (Boolean) haveSetOffset) {
- return;
- }
- ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) needOffsetView.getLayoutParams();
- layoutParams.setMargins(layoutParams.leftMargin, layoutParams.topMargin + getStatusBarHeight(activity),
- layoutParams.rightMargin, layoutParams.bottomMargin);
- needOffsetView.setTag(TAG_KEY_HAVE_SET_OFFSET, true);
- }
- }
-
- /**
- * 为 fragment 头部是 ImageView 的设置状态栏透明
- *
- * @param activity fragment 对应的 activity
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTranslucentForImageViewInFragment(Activity activity, View needOffsetView) {
- setTranslucentForImageViewInFragment(activity, DEFAULT_STATUS_BAR_ALPHA, needOffsetView);
- }
-
- /**
- * 为 fragment 头部是 ImageView 的设置状态栏透明
- *
- * @param activity fragment 对应的 activity
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTransparentForImageViewInFragment(Activity activity, View needOffsetView) {
- setTranslucentForImageViewInFragment(activity, 0, needOffsetView);
- }
-
- /**
- * 为 fragment 头部是 ImageView 的设置状态栏透明
- *
- * @param activity fragment 对应的 activity
- * @param statusBarAlpha 状态栏透明度
- * @param needOffsetView 需要向下偏移的 View
- */
- public static void setTranslucentForImageViewInFragment(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha,
- View needOffsetView) {
- setTranslucentForImageView(activity, statusBarAlpha, needOffsetView);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- clearPreviousSetting(activity);
- }
- }
-
- /**
- * 隐藏伪状态栏 View
- *
- * @param activity 调用的 Activity
- */
- public static void hideFakeStatusBarView(Activity activity) {
- ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
- View fakeStatusBarView = decorView.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- fakeStatusBarView.setVisibility(View.GONE);
- }
- View fakeTranslucentView = decorView.findViewById(FAKE_TRANSLUCENT_VIEW_ID);
- if (fakeTranslucentView != null) {
- fakeTranslucentView.setVisibility(View.GONE);
- }
- }
-
- @TargetApi(Build.VERSION_CODES.M)
- public static void setLightMode(Activity activity) {
- setMIUIStatusBarDarkIcon(activity, true);
- setMeizuStatusBarDarkIcon(activity, true);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
- }
- }
-
- @TargetApi(Build.VERSION_CODES.M)
- public static void setDarkMode(Activity activity) {
- setMIUIStatusBarDarkIcon(activity, false);
- setMeizuStatusBarDarkIcon(activity, false);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
- }
- }
-
- /**
- * 修改 MIUI V6 以上状态栏颜色
- */
- private static void setMIUIStatusBarDarkIcon(@NonNull Activity activity, boolean darkIcon) {
- Class clazz = activity.getWindow().getClass();
- try {
- Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
- Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
- int darkModeFlag = field.getInt(layoutParams);
- Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
- extraFlagField.invoke(activity.getWindow(), darkIcon ? darkModeFlag : 0, darkModeFlag);
- } catch (Exception e) {
- //e.printStackTrace();
- }
- }
-
- /**
- * 修改魅族状态栏字体颜色 Flyme 4.0
- */
- private static void setMeizuStatusBarDarkIcon(@NonNull Activity activity, boolean darkIcon) {
- try {
- WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
- Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON");
- Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags");
- darkFlag.setAccessible(true);
- meizuFlags.setAccessible(true);
- int bit = darkFlag.getInt(null);
- int value = meizuFlags.getInt(lp);
- if (darkIcon) {
- value |= bit;
- } else {
- value &= ~bit;
- }
- meizuFlags.setInt(lp, value);
- activity.getWindow().setAttributes(lp);
- } catch (Exception e) {
- //e.printStackTrace();
- }
- }
-
- ///////////////////////////////////////////////////////////////////////////////////
-
- @TargetApi(Build.VERSION_CODES.KITKAT)
- private static void clearPreviousSetting(Activity activity) {
- ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
- View fakeStatusBarView = decorView.findViewById(FAKE_STATUS_BAR_VIEW_ID);
- if (fakeStatusBarView != null) {
- decorView.removeView(fakeStatusBarView);
- ViewGroup rootView = (ViewGroup) ((ViewGroup) activity.findViewById(android.R.id.content)).getChildAt(0);
- rootView.setPadding(0, 0, 0, 0);
- }
- }
-
- /**
- * 添加半透明矩形条
- *
- * @param activity 需要设置的 activity
- * @param statusBarAlpha 透明值
- */
- private static void addTranslucentView(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha) {
- ViewGroup contentView = activity.findViewById(android.R.id.content);
- View fakeTranslucentView = contentView.findViewById(FAKE_TRANSLUCENT_VIEW_ID);
- if (fakeTranslucentView != null) {
- if (fakeTranslucentView.getVisibility() == View.GONE) {
- fakeTranslucentView.setVisibility(View.VISIBLE);
- }
- fakeTranslucentView.setBackgroundColor(Color.argb(statusBarAlpha, 0, 0, 0));
- } else {
- contentView.addView(createTranslucentStatusBarView(activity, statusBarAlpha));
- }
- }
-
- /**
- * 生成一个和状态栏大小相同的彩色矩形条
- *
- * @param activity 需要设置的 activity
- * @param color 状态栏颜色值
- * @return 状态栏矩形条
- */
- private static View createStatusBarView(Activity activity, @ColorInt int color) {
- return createStatusBarView(activity, color, 0);
- }
-
- /**
- * 生成一个和状态栏大小相同的半透明矩形条
- *
- * @param activity 需要设置的activity
- * @param color 状态栏颜色值
- * @param alpha 透明值
- * @return 状态栏矩形条
- */
- private static View createStatusBarView(Activity activity, @ColorInt int color, int alpha) {
- // 绘制一个和状态栏一样高的矩形
- View statusBarView = new View(activity);
- LinearLayout.LayoutParams params =
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getStatusBarHeight(activity));
- statusBarView.setLayoutParams(params);
- statusBarView.setBackgroundColor(calculateStatusColor(color, alpha));
- statusBarView.setId(FAKE_STATUS_BAR_VIEW_ID);
- return statusBarView;
- }
-
- /**
- * 设置根布局参数
- */
- private static void setRootView(Activity activity) {
- ViewGroup parent = activity.findViewById(android.R.id.content);
- for (int i = 0, count = parent.getChildCount(); i < count; i++) {
- View childView = parent.getChildAt(i);
- if (childView instanceof ViewGroup) {
- childView.setFitsSystemWindows(true);
- ((ViewGroup) childView).setClipToPadding(true);
- }
- }
- }
-
- /**
- * 设置透明
- */
- private static void setTransparentForWindow(Activity activity) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
- activity.getWindow()
- .getDecorView()
- .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- activity.getWindow()
- .setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
- }
-
- /**
- * 使状态栏透明
- */
- @TargetApi(Build.VERSION_CODES.KITKAT)
- private static void transparentStatusBar(Activity activity) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
- activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
- } else {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
- }
-
- /**
- * 创建半透明矩形 View
- *
- * @param alpha 透明值
- * @return 半透明 View
- */
- private static View createTranslucentStatusBarView(Activity activity, int alpha) {
- // 绘制一个和状态栏一样高的矩形
- View statusBarView = new View(activity);
- LinearLayout.LayoutParams params =
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getStatusBarHeight(activity));
- statusBarView.setLayoutParams(params);
- statusBarView.setBackgroundColor(Color.argb(alpha, 0, 0, 0));
- statusBarView.setId(FAKE_TRANSLUCENT_VIEW_ID);
- return statusBarView;
- }
-
- /**
- * 获取状态栏高度
- *
- * @param context context
- * @return 状态栏高度
- */
- private static int getStatusBarHeight(Context context) {
- // 获得状态栏高度
- int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
- return context.getResources().getDimensionPixelSize(resourceId);
- }
-
- /**
- * 计算状态栏颜色
- *
- * @param color color值
- * @param alpha alpha值
- * @return 最终的状态栏颜色
- */
- private static int calculateStatusColor(@ColorInt int color, int alpha) {
- if (alpha == 0) {
- return color;
- }
- float a = 1 - alpha / 255f;
- int red = color >> 16 & 0xff;
- int green = color >> 8 & 0xff;
- int blue = color & 0xff;
- red = (int) (red * a + 0.5);
- green = (int) (green * a + 0.5);
- blue = (int) (blue * a + 0.5);
- return 0xff << 24 | red << 16 | green << 8 | blue;
- }
-}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtilV7.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtilV7.java
deleted file mode 100644
index f29cadec..00000000
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/statusbar/StatusBarUtilV7.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package com.haier.cellarette.baselibrary.statusbar;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Build;
-//import android.support.annotation.FloatRange;
-//import android.support.annotation.RequiresApi;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.FloatRange;
-import androidx.annotation.RequiresApi;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.regex.Pattern;
-
-/**
- * 状态栏透明
- * Created by SCWANG on 2016/10/26.
- */
-
-@SuppressWarnings("unused")
-public class StatusBarUtilV7 {
-
- public static int DEFAULT_COLOR = 0;
- public static float DEFAULT_ALPHA = 0;//Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? 0.2f : 0.3f;
- public static final int MIN_API = 19;
-
- //
- public static void immersive(Activity activity) {
- immersive(activity, DEFAULT_COLOR, DEFAULT_ALPHA);
- }
-
- public static void immersive(Activity activity, int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- immersive(activity.getWindow(), color, alpha);
- }
-
- public static void immersive(Activity activity, int color) {
- immersive(activity.getWindow(), color, 1f);
- }
-
- public static void immersive(Window window) {
- immersive(window, DEFAULT_COLOR, DEFAULT_ALPHA);
- }
-
- public static void immersive(Window window, int color) {
- immersive(window, color, 1f);
- }
-
- public static void immersive(Window window, int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- if (Build.VERSION.SDK_INT >= 21) {
- window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- window.setStatusBarColor(mixtureColor(color, alpha));
-
- int systemUiVisibility = window.getDecorView().getSystemUiVisibility();
- systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
- systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
- window.getDecorView().setSystemUiVisibility(systemUiVisibility);
- } else if (Build.VERSION.SDK_INT >= 19) {
- window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- setTranslucentView((ViewGroup) window.getDecorView(), color, alpha);
- } else if (Build.VERSION.SDK_INT >= MIN_API && Build.VERSION.SDK_INT > 16) {
- int systemUiVisibility = window.getDecorView().getSystemUiVisibility();
- systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
- systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
- window.getDecorView().setSystemUiVisibility(systemUiVisibility);
- }
- }
- //
-
- //
- public static void darkMode(Activity activity, boolean dark) {
- if (isFlyme4Later()) {
- darkModeForFlyme4(activity.getWindow(), dark);
- } else if (isMIUI6Later()) {
- darkModeForMIUI6(activity.getWindow(), dark);
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- darkModeForM(activity.getWindow(), dark);
- }
- }
-
- /** 设置状态栏darkMode,字体颜色及icon变黑(目前支持MIUI6以上,Flyme4以上,Android M以上) */
- public static void darkMode(Activity activity) {
- darkMode(activity.getWindow(), DEFAULT_COLOR, DEFAULT_ALPHA);
- }
-
- public static void darkMode(Activity activity, int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- darkMode(activity.getWindow(), color, alpha);
- }
-
- /** 设置状态栏darkMode,字体颜色及icon变黑(目前支持MIUI6以上,Flyme4以上,Android M以上) */
- public static void darkMode(Window window, int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- if (isFlyme4Later()) {
- darkModeForFlyme4(window, true);
- immersive(window,color,alpha);
- } else if (isMIUI6Later()) {
- darkModeForMIUI6(window, true);
- immersive(window,color,alpha);
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- darkModeForM(window, true);
- immersive(window, color, alpha);
- } else if (Build.VERSION.SDK_INT >= 19) {
- window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- setTranslucentView((ViewGroup) window.getDecorView(), color, alpha);
- } else {
- immersive(window, color, alpha);
- }
-// if (Build.VERSION.SDK_INT >= 21) {
-// window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-// window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-// window.setStatusBarColor(Color.TRANSPARENT);
-// } else if (Build.VERSION.SDK_INT >= 19) {
-// window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-// }
-
-// setTranslucentView((ViewGroup) window.getDecorView(), color, alpha);
- }
-
- //------------------------->
-
- /** android 6.0设置字体颜色 */
- @RequiresApi(Build.VERSION_CODES.M)
- private static void darkModeForM(Window window, boolean dark) {
-// window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-// window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-// window.setStatusBarColor(Color.TRANSPARENT);
-
- int systemUiVisibility = window.getDecorView().getSystemUiVisibility();
- if (dark) {
- systemUiVisibility |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
- } else {
- systemUiVisibility &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
- }
- window.getDecorView().setSystemUiVisibility(systemUiVisibility);
- }
-
- /**
- * 设置Flyme4+的darkMode,darkMode时候字体颜色及icon变黑
- * http://open-wiki.flyme.cn/index.php?title=Flyme%E7%B3%BB%E7%BB%9FAPI
- */
- public static boolean darkModeForFlyme4(Window window, boolean dark) {
- boolean result = false;
- if (window != null) {
- try {
- WindowManager.LayoutParams e = window.getAttributes();
- Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON");
- Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags");
- darkFlag.setAccessible(true);
- meizuFlags.setAccessible(true);
- int bit = darkFlag.getInt(null);
- int value = meizuFlags.getInt(e);
- if (dark) {
- value |= bit;
- } else {
- value &= ~bit;
- }
-
- meizuFlags.setInt(e, value);
- window.setAttributes(e);
- result = true;
- } catch (Exception var8) {
- Log.e("StatusBar", "darkIcon: failed");
- }
- }
-
- return result;
- }
-
- /**
- * 设置MIUI6+的状态栏是否为darkMode,darkMode时候字体颜色及icon变黑
- * http://dev.xiaomi.com/doc/p=4769/
- */
- public static boolean darkModeForMIUI6(Window window, boolean darkmode) {
- Class clazz = window.getClass();
- try {
- int darkModeFlag = 0;
- Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
- Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
- darkModeFlag = field.getInt(layoutParams);
- Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
- extraFlagField.invoke(window, darkmode ? darkModeFlag : 0, darkModeFlag);
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- }
-
- /** 判断是否Flyme4以上 */
- public static boolean isFlyme4Later() {
- return Build.FINGERPRINT.contains("Flyme_OS_4")
- || Build.VERSION.INCREMENTAL.contains("Flyme_OS_4")
- || Pattern.compile("Flyme OS [4|5]", Pattern.CASE_INSENSITIVE).matcher(Build.DISPLAY).find();
- }
-
- /** 判断是否为MIUI6以上 */
- public static boolean isMIUI6Later() {
- try {
- Class clz = Class.forName("android.os.SystemProperties");
- Method mtd = clz.getMethod("get", String.class);
- String val = (String) mtd.invoke(null, "ro.miui.ui.version.name");
- val = val.replaceAll("[vV]", "");
- int version = Integer.parseInt(val);
- return version >= 6;
- } catch (Exception e) {
- return false;
- }
- }
- //
-
-
- /** 增加View的paddingTop,增加的值为状态栏高度 */
- public static void setPadding(Context context, View view) {
- if (Build.VERSION.SDK_INT >= MIN_API) {
- view.setPadding(view.getPaddingLeft(), view.getPaddingTop() + getStatusBarHeight(context),
- view.getPaddingRight(), view.getPaddingBottom());
- }
- }
- /** 增加View的paddingTop,增加的值为状态栏高度 (智能判断，并设置高度)*/
- public static void setPaddingSmart(Context context, View view) {
- if (Build.VERSION.SDK_INT >= MIN_API) {
- ViewGroup.LayoutParams lp = view.getLayoutParams();
- if (lp != null && lp.height > 0) {
- lp.height += getStatusBarHeight(context);//增高
- }
- view.setPadding(view.getPaddingLeft(), view.getPaddingTop() + getStatusBarHeight(context),
- view.getPaddingRight(), view.getPaddingBottom());
- }
- }
-
- /** 增加View的高度以及paddingTop,增加的值为状态栏高度.一般是在沉浸式全屏给ToolBar用的 */
- public static void setHeightAndPadding(Context context, View view) {
- if (Build.VERSION.SDK_INT >= MIN_API) {
- ViewGroup.LayoutParams lp = view.getLayoutParams();
- lp.height += getStatusBarHeight(context);//增高
- view.setPadding(view.getPaddingLeft(), view.getPaddingTop() + getStatusBarHeight(context),
- view.getPaddingRight(), view.getPaddingBottom());
- }
- }
- /** 增加View上边距（MarginTop）一般是给高度为 WARP_CONTENT 的小控件用的*/
- public static void setMargin(Context context, View view) {
- if (Build.VERSION.SDK_INT >= MIN_API) {
- ViewGroup.LayoutParams lp = view.getLayoutParams();
- if (lp instanceof ViewGroup.MarginLayoutParams) {
- ((ViewGroup.MarginLayoutParams) lp).topMargin += getStatusBarHeight(context);//增高
- }
- view.setLayoutParams(lp);
- }
- }
- /**
- * 创建假的透明栏
- */
- public static void setTranslucentView(ViewGroup container, int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- if (Build.VERSION.SDK_INT >= 19) {
- int mixtureColor = mixtureColor(color, alpha);
- View translucentView = container.findViewById(android.R.id.custom);
- if (translucentView == null && mixtureColor != 0) {
- translucentView = new View(container.getContext());
- translucentView.setId(android.R.id.custom);
- ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, getStatusBarHeight(container.getContext()));
- container.addView(translucentView, lp);
- }
- if (translucentView != null) {
- translucentView.setBackgroundColor(mixtureColor);
- }
- }
- }
-
- public static int mixtureColor(int color, @FloatRange(from = 0.0, to = 1.0) float alpha) {
- int a = (color & 0xff000000) == 0 ? 0xff : color >>> 24;
- return (color & 0x00ffffff) | (((int) (a * alpha)) << 24);
- }
-
- /** 获取状态栏高度 */
- public static int getStatusBarHeight(Context context) {
- int result = 24;
- int resId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
- if (resId > 0) {
- result = context.getResources().getDimensionPixelSize(resId);
- } else {
- result = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- result, Resources.getSystem().getDisplayMetrics());
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/tablayout/UnAnimTabLayout.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/tablayout/UnAnimTabLayout.java
index d93f372c..fd9c6bf7 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/tablayout/UnAnimTabLayout.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/tablayout/UnAnimTabLayout.java
@@ -1,7 +1,7 @@
package com.haier.cellarette.baselibrary.tablayout;
import android.content.Context;
-//import android.support.annotation.NonNull;
+//
//import android.support.design.widget.TabLayout;
import android.util.AttributeSet;
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/usersdk/LoginUtil.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/usersdk/LoginUtil.java
deleted file mode 100644
index e0b3dd9f..00000000
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/usersdk/LoginUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.haier.cellarette.baselibrary.usersdk;
-
-import android.app.Activity;
-import android.content.Intent;
-
-/**
- * Created by shining on 2017/11/8.
- */
-
-public class LoginUtil {
-
- public static final int LOGIN_REQUEST_CODE = 301;
- public static final int LOGINOUT_REQUEST_CODE = 302;
- public static final int LOGIN_RESULT_OK = 101;
- public static final int LOGIN_RESULT_CANCELED = 102;
- public static final int LOGINOUT_RESULT_OK = 201;
- public static final int LOGINOUT_RESULT_CANCELED = 202;
-
- private static LoginUtil sInstance;
- private static final Object lock = new Object();
- private Runnable mLastRunnnable;
-
-
- public LoginUtil() {
- }
-
- public static LoginUtil get() {
- if (sInstance == null) {
- synchronized (lock) {
- sInstance = new LoginUtil();
- }
- }
- return sInstance;
- }
-
- /**
- * 用户是否登录
- *
- * @return
- */
- public static boolean isUserLogin() {
- // step 1 判断内存中是否有user_id
-// if (!TextUtils.isEmpty(DataProvider.getUser_id())) {
-// return true;
-// }
-// // step 2 如果内存中没有， 则去文件中找
-// String uid = (String) SpUtils.get(get()).get(ConstantUtil.USER_ID, null);
-// // step 3 如果文件中有， 则提到内存中
-// if (!TextUtils.isEmpty(uid)) {
-// DataProvider.setUser_id(uid);
-// return true;
-// }
- // 未登录
- return false;
- }
-
-
-
- public void loginTowhere(Activity activity, Runnable runnable) {
- if (isUserLogin()) {
- if (runnable != null) {
- runnable.run();
- }
- }
- mLastRunnnable = runnable;
- login(activity);
- }
-
- public void login(Activity activity) {
- Intent intent = new Intent("hs.act.loginactivity");
- if (intent.resolveActivity(activity.getPackageManager()) != null) {
- activity.startActivityForResult(intent, LOGIN_REQUEST_CODE);
- }
- }
-
- public void loginOutTowhere(Activity activity, Runnable runnable) {
- if (isUserLogin()) {
- if (runnable == null) {
- runnable.run();
- }
- }
- mLastRunnnable = runnable;
- loginOut(activity);
- }
-
- public void loginOut(Activity activity) {
- Intent intent = new Intent("hs.act.loginoutactivity");
- if (intent.resolveActivity(activity.getPackageManager()) != null) {
- activity.startActivityForResult(intent, LOGINOUT_REQUEST_CODE);
- }
- }
-
- public boolean login_activity_result(int requestCode, int resultCode, Intent data) {
- Runnable runnable = mLastRunnnable;
- mLastRunnnable = null;
- //已登录
- if (requestCode == LOGIN_REQUEST_CODE) {
- if (resultCode == LOGIN_RESULT_OK && runnable != null) {
- runnable.run();
- }
- return true;
- }
- //未登录
- if (requestCode == LOGINOUT_REQUEST_CODE) {
- if (resultCode == LOGINOUT_RESULT_OK && runnable != null) {
- runnable.run();
- }
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/widget/SwitchButton.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/widget/SwitchButton.java
index 96dba82c..0a433d95 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/widget/SwitchButton.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/widget/SwitchButton.java
@@ -22,6 +22,7 @@
/**
* 自义定开关按钮
+ * https://github.com/kyleduo/SwitchButton
*/
public class SwitchButton extends View implements Checkable {
private static final int DEFAULT_WIDTH = dp2pxInt(58);
diff --git a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/zothers/SpannableStringUtils.java b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/zothers/SpannableStringUtils.java
index de6cd0b6..1616c3fd 100644
--- a/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/zothers/SpannableStringUtils.java
+++ b/commonlibs/baselibrary/src/main/java/com/haier/cellarette/baselibrary/zothers/SpannableStringUtils.java
@@ -39,8 +39,8 @@
//import android.support.annotation.ColorInt;
//import android.support.annotation.DrawableRes;
-//import android.support.annotation.NonNull;
-//import android.support.annotation.Nullable;
+//
+//
/**
*
diff --git a/commonlibs/baselibrary/src/main/res/drawable/bg_large_oval_radius.xml b/commonlibs/baselibrary/src/main/res/drawable/bg_large_oval_radius.xml
new file mode 100644
index 00000000..817dafad
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/drawable/bg_large_oval_radius.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/drawable/bg_oval_radius.xml b/commonlibs/baselibrary/src/main/res/drawable/bg_oval_radius.xml
new file mode 100644
index 00000000..549e684a
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/drawable/bg_oval_radius.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/drawable/ed_bg.xml b/commonlibs/baselibrary/src/main/res/drawable/ed_bg.xml
new file mode 100644
index 00000000..e26708fd
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/drawable/ed_bg.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_bigimageviewpager.xml b/commonlibs/baselibrary/src/main/res/layout/activity_bigimageviewpager.xml
new file mode 100644
index 00000000..8360455f
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_bigimageviewpager.xml
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_expandabletextview.xml b/commonlibs/baselibrary/src/main/res/layout/activity_expandabletextview.xml
new file mode 100644
index 00000000..6d81bfdc
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_expandabletextview.xml
@@ -0,0 +1,393 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_marqueeviewlibrary.xml b/commonlibs/baselibrary/src/main/res/layout/activity_marqueeviewlibrary.xml
new file mode 100644
index 00000000..21985f75
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_marqueeviewlibrary.xml
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_network_loading.xml b/commonlibs/baselibrary/src/main/res/layout/activity_network_loading1.xml
similarity index 100%
rename from commonlibs/baselibrary/src/main/res/layout/activity_network_loading.xml
rename to commonlibs/baselibrary/src/main/res/layout/activity_network_loading1.xml
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_pingfen.xml b/commonlibs/baselibrary/src/main/res/layout/activity_pingfen.xml
new file mode 100644
index 00000000..9043a83a
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_pingfen.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/hunheku/libappjpushshare/src/main/res/layout/activity_shareindex1.xml b/commonlibs/baselibrary/src/main/res/layout/activity_scardview.xml
similarity index 53%
rename from commonlibs/hunheku/libappjpushshare/src/main/res/layout/activity_shareindex1.xml
rename to commonlibs/baselibrary/src/main/res/layout/activity_scardview.xml
index db2b1ff2..6dc34a22 100644
--- a/commonlibs/hunheku/libappjpushshare/src/main/res/layout/activity_shareindex1.xml
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_scardview.xml
@@ -2,28 +2,34 @@
+ android:text="阴影方向" />
+ android:text="边角可见性" />
+ android:text="官方cardview" />
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_scardview1.xml b/commonlibs/baselibrary/src/main/res/layout/activity_scardview1.xml
new file mode 100644
index 00000000..f6787558
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_scardview1.xml
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_scardview2.xml b/commonlibs/baselibrary/src/main/res/layout/activity_scardview2.xml
new file mode 100644
index 00000000..5a493c59
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_scardview2.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_scardview3.xml b/commonlibs/baselibrary/src/main/res/layout/activity_scardview3.xml
new file mode 100644
index 00000000..27edb428
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_scardview3.xml
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/activity_show_in_recycler_view.xml b/commonlibs/baselibrary/src/main/res/layout/activity_show_in_recycler_view.xml
new file mode 100644
index 00000000..14f9df05
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/activity_show_in_recycler_view.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
diff --git a/commonlibs/baselibrary/src/main/res/layout/complex_view.xml b/commonlibs/baselibrary/src/main/res/layout/complex_view.xml
new file mode 100644
index 00000000..0d9a194c
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/complex_view.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/dialog_input.xml b/commonlibs/baselibrary/src/main/res/layout/dialog_input.xml
new file mode 100644
index 00000000..9fb74162
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/dialog_input.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/empty_error.xml b/commonlibs/baselibrary/src/main/res/layout/empty_error1.xml
similarity index 100%
rename from commonlibs/baselibrary/src/main/res/layout/empty_error.xml
rename to commonlibs/baselibrary/src/main/res/layout/empty_error1.xml
diff --git a/commonlibs/baselibrary/src/main/res/layout/empty_loading.xml b/commonlibs/baselibrary/src/main/res/layout/empty_loading1.xml
similarity index 100%
rename from commonlibs/baselibrary/src/main/res/layout/empty_loading.xml
rename to commonlibs/baselibrary/src/main/res/layout/empty_loading1.xml
diff --git a/commonlibs/baselibrary/src/main/res/layout/empty_nodata.xml b/commonlibs/baselibrary/src/main/res/layout/empty_nodata1.xml
similarity index 100%
rename from commonlibs/baselibrary/src/main/res/layout/empty_nodata.xml
rename to commonlibs/baselibrary/src/main/res/layout/empty_nodata1.xml
diff --git a/commonlibs/baselibrary/src/main/res/layout/empty_view_demo.xml b/commonlibs/baselibrary/src/main/res/layout/empty_view_demo.xml
index a93ac4b5..29e54917 100644
--- a/commonlibs/baselibrary/src/main/res/layout/empty_view_demo.xml
+++ b/commonlibs/baselibrary/src/main/res/layout/empty_view_demo.xml
@@ -7,8 +7,8 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="gone"
- app:errornet_layout="@layout/empty_error"
- app:loading_layout="@layout/empty_loading"
- app:nodata_layout="@layout/empty_nodata"
- app:unreachable_layout="@layout/empty_nodata"
+ app:errornet_layout="@layout/empty_error1"
+ app:loading_layout="@layout/empty_loading1"
+ app:nodata_layout="@layout/empty_nodata1"
+ app:unreachable_layout="@layout/empty_nodata1"
tools:visibility="visible" />
diff --git a/commonlibs/baselibrary/src/main/res/layout/image_progress_layout_theme_1.xml b/commonlibs/baselibrary/src/main/res/layout/image_progress_layout_theme_1.xml
new file mode 100644
index 00000000..961a2ebd
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/image_progress_layout_theme_1.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/layout/item_text.xml b/commonlibs/baselibrary/src/main/res/layout/item_text.xml
new file mode 100644
index 00000000..fd4390c4
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/layout/item_text.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/menu/menu_layout.xml b/commonlibs/baselibrary/src/main/res/menu/menu_layout.xml
new file mode 100644
index 00000000..14636872
--- /dev/null
+++ b/commonlibs/baselibrary/src/main/res/menu/menu_layout.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/gray.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/gray.png
new file mode 100644
index 00000000..aaa31c2e
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/gray.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/green.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/green.png
new file mode 100644
index 00000000..a684bcc0
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/green.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/icon.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/icon.png
new file mode 100644
index 00000000..046a286f
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/icon.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/logo.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/logo.png
new file mode 100644
index 00000000..3c766e57
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/logo.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/piliang.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/piliang.png
new file mode 100644
index 00000000..dd10351e
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/piliang.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/right.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/right.png
new file mode 100644
index 00000000..ab75cc3e
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/right.png differ
diff --git a/commonlibs/baselibrary/src/main/res/mipmap-hdpi/speaker.png b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/speaker.png
new file mode 100644
index 00000000..96a754c3
Binary files /dev/null and b/commonlibs/baselibrary/src/main/res/mipmap-hdpi/speaker.png differ
diff --git a/commonlibs/baselibrary/src/main/res/values/attrs.xml b/commonlibs/baselibrary/src/main/res/values/attrs.xml
index 31055071..f2e6dc21 100644
--- a/commonlibs/baselibrary/src/main/res/values/attrs.xml
+++ b/commonlibs/baselibrary/src/main/res/values/attrs.xml
@@ -40,12 +40,6 @@
-
-
-
-
-
-
@@ -366,6 +360,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/hunheku/libagentweb-core/.gitignore b/commonlibs/common/libagentweb-core/.gitignore
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/.gitignore
rename to commonlibs/common/libagentweb-core/.gitignore
diff --git a/commonlibs/hunheku/libagentweb-core/build.gradle b/commonlibs/common/libagentweb-core/build.gradle
similarity index 69%
rename from commonlibs/hunheku/libagentweb-core/build.gradle
rename to commonlibs/common/libagentweb-core/build.gradle
index 06baf2a7..07bc7b9f 100644
--- a/commonlibs/hunheku/libagentweb-core/build.gradle
+++ b/commonlibs/common/libagentweb-core/build.gradle
@@ -6,11 +6,10 @@ def config = rootProject.ext //配置
def librarys = rootProject.ext.dependencies //
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
-// implementation 'com.download.library:Downloader:4.1.2'
implementation 'com.github.Justson:Downloader:v4.1.9'
- implementation project(':commonlibs:hunheku:libutils')
-// implementation 'com.coolindicator.sdk:coolindicator:1.0.0-beta'
+ implementation project(':commonlibs:common:libutils')
// implementation (name: 'alipaysdk-15.8.01.210112203525', ext: 'aar')
implementation project(path: ':libsCenterNew:alipaysdk')
+
}
diff --git a/commonlibs/hunheku/libagentweb-core/proguard-rules.pro b/commonlibs/common/libagentweb-core/proguard-rules.pro
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/proguard-rules.pro
rename to commonlibs/common/libagentweb-core/proguard-rules.pro
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/AndroidManifest.xml b/commonlibs/common/libagentweb-core/src/main/AndroidManifest.xml
similarity index 99%
rename from commonlibs/hunheku/libagentweb-core/src/main/AndroidManifest.xml
rename to commonlibs/common/libagentweb-core/src/main/AndroidManifest.xml
index b15bac56..124592e4 100644
--- a/commonlibs/hunheku/libagentweb-core/src/main/AndroidManifest.xml
+++ b/commonlibs/common/libagentweb-core/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/web_files_public" />
-
= Build.VERSION_CODES.M) {
+ rationale = shouldShowRequestPermissionRationale(permission);
+ }
if (rationale) {
break;
}
@@ -161,7 +164,9 @@ private void permission(Action action) {
return;
}
if (mPermissionListener != null){
- requestPermissions(permissions.toArray(new String[]{}), 1);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ requestPermissions(permissions.toArray(new String[]{}), 1);
+ }
}
}
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWeb.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWeb.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWeb.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWeb.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebConfig.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebConfig.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebConfig.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebConfig.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebFileProvider.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebFileProvider.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebFileProvider.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebFileProvider.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebJsInterfaceCompat.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebJsInterfaceCompat.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebJsInterfaceCompat.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebJsInterfaceCompat.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebPermissions.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebPermissions.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebPermissions.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebPermissions.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebSettingsImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebSettingsImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebSettingsImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebSettingsImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUIControllerImplBase.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUIControllerImplBase.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUIControllerImplBase.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUIControllerImplBase.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebUtils.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebView.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebView.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/AgentWebView.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/AgentWebView.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorSpec.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorSpec.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorSpec.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorSpec.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorView.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorView.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorView.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseIndicatorView.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultChromeClient.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultChromeClient.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultChromeClient.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultChromeClient.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultDesignUIController.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultDesignUIController.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultDesignUIController.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultDesignUIController.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultDownloadImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultDownloadImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultDownloadImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultDownloadImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultUIController.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultUIController.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultUIController.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultUIController.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebClient.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebClient.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebClient.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebClient.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebCreator.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebCreator.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebCreator.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebCreator.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebLifeCycleImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebLifeCycleImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebLifeCycleImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/DefaultWebLifeCycleImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/EventHandlerImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/EventHandlerImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/EventHandlerImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/EventHandlerImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/EventInterceptor.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/EventInterceptor.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/EventInterceptor.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/EventInterceptor.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/HookManager.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/HookManager.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/HookManager.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/HookManager.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/HttpHeaders.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/HttpHeaders.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/HttpHeaders.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/HttpHeaders.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IAgentWebSettings.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IAgentWebSettings.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IAgentWebSettings.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IAgentWebSettings.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IEventHandler.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IEventHandler.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IEventHandler.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IEventHandler.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IUrlLoader.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IUrlLoader.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IUrlLoader.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IUrlLoader.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IVideo.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IVideo.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IVideo.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IVideo.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IWebIndicator.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IWebIndicator.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IWebIndicator.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IWebIndicator.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IWebLayout.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IWebLayout.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IWebLayout.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IWebLayout.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IndicatorController.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IndicatorController.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IndicatorController.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IndicatorController.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IndicatorHandler.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IndicatorHandler.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/IndicatorHandler.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/IndicatorHandler.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntrace.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntrace.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntrace.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntrace.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntraceImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntraceImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntraceImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsAccessEntraceImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsBaseInterfaceHolder.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsBaseInterfaceHolder.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsBaseInterfaceHolder.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsBaseInterfaceHolder.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsCallJava.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsCallJava.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsCallJava.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsCallJava.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsCallback.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsCallback.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsCallback.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsCallback.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolder.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolder.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolder.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolder.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolderImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolderImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolderImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceHolderImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceObjectException.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceObjectException.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceObjectException.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/JsInterfaceObjectException.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LayoutParamsOffer.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LayoutParamsOffer.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LayoutParamsOffer.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LayoutParamsOffer.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LogUtils.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LogUtils.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LogUtils.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LogUtils.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LollipopFixedWebView.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LollipopFixedWebView.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/LollipopFixedWebView.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/LollipopFixedWebView.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebChromeBase.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebChromeBase.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebChromeBase.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebChromeBase.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebClientBase.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebClientBase.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebClientBase.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/MiddlewareWebClientBase.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/NestedScrollAgentWebView.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/NestedScrollAgentWebView.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/NestedScrollAgentWebView.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/NestedScrollAgentWebView.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/PermissionInterceptor.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/PermissionInterceptor.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/PermissionInterceptor.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/PermissionInterceptor.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/ProcessUtils.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/ProcessUtils.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/ProcessUtils.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/ProcessUtils.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/Provider.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/Provider.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/Provider.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/Provider.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/QuickCallJs.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/QuickCallJs.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/QuickCallJs.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/QuickCallJs.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/UrlCommonException.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/UrlCommonException.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/UrlCommonException.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/UrlCommonException.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/UrlLoaderImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/UrlLoaderImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/UrlLoaderImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/UrlLoaderImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/VideoImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/VideoImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/VideoImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/VideoImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClient.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClient.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClient.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClient.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClientDelegate.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClientDelegate.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClientDelegate.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebChromeClientDelegate.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebCreator.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebCreator.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebCreator.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebCreator.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebIndicator.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebIndicator.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebIndicator.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebIndicator.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebLifeCycle.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebLifeCycle.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebLifeCycle.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebLifeCycle.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebListenerManager.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebListenerManager.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebListenerManager.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebListenerManager.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebParentLayout.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebParentLayout.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebParentLayout.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebParentLayout.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityCheckLogic.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityCheckLogic.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityCheckLogic.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityCheckLogic.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityController.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityController.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityController.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityController.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityControllerImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityControllerImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityControllerImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityControllerImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityLogicImpl.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityLogicImpl.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityLogicImpl.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebSecurityLogicImpl.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebViewClient.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebViewClient.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebViewClient.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebViewClient.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebViewClientDelegate.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebViewClientDelegate.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/WebViewClientDelegate.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/WebViewClientDelegate.java
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java
index 8ed2e715..49e43716 100644
--- a/commonlibs/hunheku/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java
+++ b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebActivity.java
@@ -16,7 +16,6 @@
import androidx.appcompat.app.AppCompatActivity;
import com.blankj.utilcode.util.LogUtils;
-import com.just.agentweb.R;
import com.just.agentweb.AgentWeb;
import com.just.agentweb.AgentWebConfig;
import com.just.agentweb.AgentWebSettingsImpl;
@@ -27,6 +26,7 @@
import com.just.agentweb.MiddlewareWebChromeBase;
import com.just.agentweb.MiddlewareWebClientBase;
import com.just.agentweb.PermissionInterceptor;
+import com.just.agentweb.R;
import com.just.agentweb.WebChromeClient;
import com.just.agentweb.WebViewClient;
diff --git a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/base/news/BaseAgentWebFragment.java b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebFragment.java
similarity index 99%
rename from yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/base/news/BaseAgentWebFragment.java
rename to commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebFragment.java
index 2734e81f..ecbd643f 100644
--- a/yewulibs1/yewulibs1-appcomm/src/main/java/com/example/slbappcomm/base/news/BaseAgentWebFragment.java
+++ b/commonlibs/common/libagentweb-core/src/main/java/com/just/agentweb/base/BaseAgentWebFragment.java
@@ -1,4 +1,4 @@
-package com.example.slbappcomm.base.news;
+package com.just.agentweb.base;
import android.content.Intent;
import android.os.Bundle;
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/drawable/default_drawable_indicator.xml b/commonlibs/common/libagentweb-core/src/main/res/drawable/default_drawable_indicator.xml
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/drawable/default_drawable_indicator.xml
rename to commonlibs/common/libagentweb-core/src/main/res/drawable/default_drawable_indicator.xml
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/drawable/ic_back.png b/commonlibs/common/libagentweb-core/src/main/res/drawable/ic_back.png
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/drawable/ic_back.png
rename to commonlibs/common/libagentweb-core/src/main/res/drawable/ic_back.png
diff --git a/commonlibs/common/libagentweb-core/src/main/res/drawable/indicator_blue_bg2.xml b/commonlibs/common/libagentweb-core/src/main/res/drawable/indicator_blue_bg2.xml
new file mode 100644
index 00000000..02e17fac
--- /dev/null
+++ b/commonlibs/common/libagentweb-core/src/main/res/drawable/indicator_blue_bg2.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/layout/agentweb_error_page.xml b/commonlibs/common/libagentweb-core/src/main/res/layout/agentweb_error_page.xml
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/layout/agentweb_error_page.xml
rename to commonlibs/common/libagentweb-core/src/main/res/layout/agentweb_error_page.xml
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/values-zh/strings.xml b/commonlibs/common/libagentweb-core/src/main/res/values-zh/strings.xml
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/values-zh/strings.xml
rename to commonlibs/common/libagentweb-core/src/main/res/values-zh/strings.xml
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/values/attrs.xml b/commonlibs/common/libagentweb-core/src/main/res/values/attrs.xml
similarity index 100%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/values/attrs.xml
rename to commonlibs/common/libagentweb-core/src/main/res/values/attrs.xml
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/values/colors.xml b/commonlibs/common/libagentweb-core/src/main/res/values/colors.xml
similarity index 99%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/values/colors.xml
rename to commonlibs/common/libagentweb-core/src/main/res/values/colors.xml
index 7000a47f..a595edfc 100644
--- a/commonlibs/hunheku/libagentweb-core/src/main/res/values/colors.xml
+++ b/commonlibs/common/libagentweb-core/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
#FB6215
#f75acb
#1ae8ff
+
+
\ No newline at end of file
diff --git a/commonlibs/hunheku/libagentweb-core/src/main/res/values/ids.xml b/commonlibs/common/libagentweb-core/src/main/res/values/ids.xml
similarity index 99%
rename from commonlibs/hunheku/libagentweb-core/src/main/res/values/ids.xml
rename to commonlibs/common/libagentweb-core/src/main/res/values/ids.xml
index d473a79d..2441540e 100644
--- a/commonlibs/hunheku/libagentweb-core/src/main/res/values/ids.xml
+++ b/commonlibs/common/libagentweb-core/src/main/res/values/ids.xml
@@ -4,4 +4,5 @@