Explorar o código

点击前往或者x会向粘贴板中写入空数据

zengjiebin %!s(int64=7) %!d(string=hai) anos
pai
achega
8730bb5df7

+ 3 - 6
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -14,7 +14,6 @@ import android.support.design.widget.TabLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.TextUtils;
-import android.util.Patterns;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
@@ -104,7 +103,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
@@ -2596,11 +2594,10 @@ public class CommonUtil {
             return;
         }
         CharSequence text = StringUtils.getCopyText();
-        String used = DataUtil.getAsString(Config.KEY_USED_COPY_TEXT, null);
-        LogUtil.println("checkCopyText", "\ntext\t", text, "\nused\t", used);
-        if (!TextUtils.isEmpty(text) && !TextUtils.equals(text.toString(), used)) {//内容不为空时或者与上次记录的内容不相同时
+        LogUtil.println("checkCopyText", "\ntext\t", text);
+        if (!TextUtils.isEmpty(text)) {//内容不为空时尝试检查
             String textString = text.toString();
-            View.OnClickListener closeListener = view -> DataUtil.putAsString(Config.KEY_USED_COPY_TEXT, textString);
+            View.OnClickListener closeListener = view -> StringUtils.CopyText("\t");//清除粘贴板内容,直接填空不行,不知道为什么
             DialogConfig dialogConfig = new DialogConfig().setTitle("小绵羊提示").setBtnCloseOnClickListener(closeListener);
             String url;
             if ((url = StringUtils.findUrl(text)) != null) {//如果是链接,直接跳转外部浏览器

+ 4 - 3
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -17,7 +17,6 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.support.annotation.DimenRes;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -1427,6 +1426,7 @@ public class ViewUtil {
     }
 
 
+    //显示游戏对话框  点击前往或者x会向粘贴板中写入空数据
     public static void showGameDialog(Applications applications, View.OnClickListener onClickListener) {
         Context mContext = SheepApp.getInstance();
         View dialog_parent = View.inflate(SheepApp.getInstance(), R.layout.dialog_parent, null);
@@ -1435,7 +1435,7 @@ public class ViewUtil {
         TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
         View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
 
-        LayoutParamsUtil.resetLayoutParams(dialog_center_ll, new Lp().setWidth(G.WIDTH / 2));
+        LayoutParamsUtil.resetLayoutParams(dialog_center_ll, new Lp().setWidth(G.WIDTH * 5 / 6));
         dialog_center_ll.setPadding(0, 0, 0, 0);
         ViewUtil.setVisibility(dialog_title, false);
         dialog_close.setOnClickListener(view -> {
@@ -1443,7 +1443,7 @@ public class ViewUtil {
             dismiss(dialog, 0);
         });
 
-        final View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_item_game_center_4_3, dialog_center_ll, true);
+        final View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_game, dialog_center_ll, true);
         ImageView dialog_icon_iv = view.findViewById(R.id.dialog_icon_iv);
         TextView dialog_name_tv = view.findViewById(R.id.dialog_name_tv);
         TextView dialog_btn_tv = view.findViewById(R.id.dialog_btn_tv);
@@ -1452,6 +1452,7 @@ public class ViewUtil {
         setText(dialog_name_tv, applications.getName());
         dialog_btn_tv.setOnClickListener(view1 -> {
             Jump2View.getInstance().goEntity(applications);
+            onClickListener.onClick(view);
             dismiss(dialog, 0);
         });
 

+ 0 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -56,7 +56,6 @@ public class Config {
 
     //缓存数据的key
     public static final String KEY_ENABLE_CHECK_COPY_TEXT = "enable_check_copy_text";//是否开启粘贴板助手的key boolean
-    public static final String KEY_USED_COPY_TEXT = "used_copy_text";//忽略的复制内容的key String
 
     //默认值
     public static boolean dvbEnableCheckCopyText(){

+ 8 - 6
app/src/main/res/layout/dialog_item_game_center_4_3.xml

@@ -4,7 +4,8 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:orientation="vertical"
-    android:paddingTop="16dp">
+    android:paddingTop="31dp"
+    android:paddingBottom="27dp">
 
     <ImageView
         android:id="@+id/dialog_icon_iv"
@@ -19,18 +20,19 @@
         android:id="@+id/dialog_name_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
         android:ellipsize="end"
         android:gravity="center"
         android:singleLine="true"
         android:textColor="#333333"
-        android:textSize="13sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:id="@+id/dialog_btn_tv"
-        style="@style/style_button"
-        android:layout_width="match_parent"
-        android:text="查看详情" />
+        style="@style/style_button_find"
+        android:layout_marginTop="48dp"
+        android:layout_gravity="center_horizontal"
+        android:text="前往" />
 </LinearLayout>