From 3c6fa79a1a49cb333cb6d7bc3dd9672e4a4e0f3d Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Wed, 22 Sep 2021 10:10:20 +0800 Subject: [PATCH] atom --- .../fuzhu/activity/MainActivity.java | 35 ++++++++----------- app_config.gradle | 2 +- .../java/com/derry/wechat/W_MainActivity.java | 1 + .../java/com/derry/wechat/WeChatPlate.java | 2 ++ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java b/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java index 38e9872..3c49ede 100644 --- a/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java +++ b/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java @@ -1,7 +1,6 @@ package com.fisherbone.fuzhu.activity; import android.Manifest; -import android.annotation.SuppressLint; import android.app.Activity; import android.app.ActivityManager; import android.content.ComponentName; @@ -16,14 +15,11 @@ import android.os.Handler; import android.os.IBinder; import android.provider.Settings; import android.util.Log; -import android.view.Gravity; import android.view.View; -import android.view.ViewGroup; import android.widget.PopupWindow; import android.widget.TextView; import com.blankj.utilcode.util.ToastUtils; -import com.derry.wechat.WeChatPlate; import com.fisherbone.fuzhu.BaseActivity; import com.fisherbone.fuzhu.BuildConfig; import com.fisherbone.fuzhu.ChangLiang; @@ -32,7 +28,6 @@ import com.fisherbone.fuzhu.FuzhuApplication; import com.fisherbone.fuzhu.InfoMessage; import com.fisherbone.fuzhu.LiveActivity; import com.fisherbone.fuzhu.LiveSuiJiActivity; -import com.fisherbone.fuzhu.MainActivityy; import com.fisherbone.fuzhu.R; import com.fisherbone.fuzhu.TestTwoService; import com.fisherbone.fuzhu.abllib.AblConfig; @@ -41,7 +36,6 @@ import com.fisherbone.fuzhu.abllib.AblStepHandler; import com.fisherbone.fuzhu.abllib.AblSteps; import com.fisherbone.fuzhu.abllib.utils.AblUtil; import com.fisherbone.fuzhu.abllib.utils.AblViewUtil; - import com.fisherbone.fuzhu.api.GetVesionResponseBean; import com.fisherbone.fuzhu.api.NewsApiInterface; import com.fisherbone.fuzhu.db.CommentBeanData; @@ -106,7 +100,6 @@ import com.xiangxue.arouter_api.RouterManager; import com.xiangxue.common.network.TecentNetworkApi; import com.xiangxue.common.network.observer.BaseObserver; - import org.json.JSONException; import org.json.JSONObject; @@ -314,20 +307,20 @@ public class MainActivity extends BaseActivity implements InfoMessage { findViewById( R.id.rl_bottom_03).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - @SuppressLint("InflateParams") View v = getLayoutInflater().inflate(com.derry.wechat.R.layout.layout_pop,null); - TextView viewById = v.findViewById(R.id.wechat_cut); - viewById.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(MainActivity.this, WeChatPlate.class); - intent.putExtra("name", "Derry"); - startActivity(intent); - } - }); - mPopCut = new PopupWindow(v, ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT); - mPopCut.setTouchable(true); - mPopCut.setFocusable(true); - mPopCut.showAtLocation(getWindow().getDecorView(), Gravity.BOTTOM,0,0); +// @SuppressLint("InflateParams") View v = getLayoutInflater().inflate(com.derry.wechat.R.layout.layout_pop,null); +// TextView viewById = v.findViewById(R.id.wechat_cut); +// viewById.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// Intent intent = new Intent(MainActivity.this, WeChatPlate.class); +// intent.putExtra("name", "Derry"); +// startActivity(intent); +// } +// }); +// mPopCut = new PopupWindow(v, ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT); +// mPopCut.setTouchable(true); +// mPopCut.setFocusable(true); +// mPopCut.showAtLocation(getWindow().getDecorView(), Gravity.BOTTOM,0,0); } }); diff --git a/app_config.gradle b/app_config.gradle index 9c2ab0d..16ff273 100644 --- a/app_config.gradle +++ b/app_config.gradle @@ -1,7 +1,7 @@ ext { // 测试环境 / 正式环境 （组件化环境 / 集成化环境） - isRelease = true; + isRelease = false; // 定义一个包名，用于存放APT生成的所有类文件 packageNameForAPT = "com.fisherbone.fuzhu"; diff --git a/wechat/src/main/java/com/derry/wechat/W_MainActivity.java b/wechat/src/main/java/com/derry/wechat/W_MainActivity.java index e242a6f..64ee4d4 100644 --- a/wechat/src/main/java/com/derry/wechat/W_MainActivity.java +++ b/wechat/src/main/java/com/derry/wechat/W_MainActivity.java @@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.blankj.utilcode.util.ToastUtils; +import com.derry.wechat.debug.R; import com.levine.abllib.AblConfig; import com.levine.abllib.AblService; import com.levine.abllib.AblStepHandler; diff --git a/wechat/src/main/java/com/derry/wechat/WeChatPlate.java b/wechat/src/main/java/com/derry/wechat/WeChatPlate.java index b7a5a67..b686422 100644 --- a/wechat/src/main/java/com/derry/wechat/WeChatPlate.java +++ b/wechat/src/main/java/com/derry/wechat/WeChatPlate.java @@ -13,6 +13,8 @@ import android.widget.PopupWindow; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import com.derry.wechat.debug.R; + public class WeChatPlate extends AppCompatActivity { private PopupWindow mPopCut;