强力修复淘宝设置乱跑 以及 多重淘宝设置

Author: eritpchy

app/src/main/java/com/yyxx/wechatfp/util/ViewUtil.java

@@ -13,11 +13,14 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.TextView;
 
 import com.yyxx.wechatfp.util.log.L;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,6 +123,7 @@ public static View findViewByName(Activity activity, String packageName, String.
             View rootView = activity.getWindow().getDecorView();
             List<View> viewList = new ArrayList<>();
             getChildViews((ViewGroup) rootView, id, viewList);
+            Collections.sort(viewList, sYLocationLHCompator);
             int outViewListSize = viewList.size();
             if (outViewListSize == 1) {
                 return viewList.get(0);
@@ -161,6 +165,9 @@ public static String getViewInfo(View view) {
         if (view instanceof TextView) {
             stringBuffer.append(" text:").append(((TextView) view).getText());
         }
+        int []location = new int[]{0,0};
+        view.getLocationOnScreen(location);
+        stringBuffer.append(" cor x:").append(location[0]).append(" y:").append(location[1]);
         return stringBuffer.toString();
     }
 
@@ -231,4 +238,30 @@ public static void getChildViews(ViewGroup parent, List<View> outList) {
             }
         }
     }
+
+    private static Comparator<View> sYLocationLHCompator = new Comparator<View>() {
+        @Override
+        public int compare(View o1, View o2) {
+            int y1 = getViewYPosInScreen(o1);
+            int y2 = getViewYPosInScreen(o2);
+            return Integer.compare(y1, y2);
+        }
+    };
+
+    public static int getViewYPosInScreen(View v) {
+        int[] location = new int[]{0, 0};
+        v.getLocationOnScreen(location);
+        return location[1];
+    }
+
+    public static void removeFromSuperView(View v) {
+        ViewParent parentView = v.getParent();
+        if (parentView == null) {
+            return;
+        }
+        if (parentView instanceof ViewGroup) {
+            ViewGroup parentLayout = (ViewGroup) parentView;
+            parentLayout.removeView(v);
+        }
+    }
 }

app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedTaobaoPlugin.java

@@ -59,6 +59,9 @@ public class XposedTaobaoPlugin {
     private Activity mCurrentActivity;
 
     private boolean mIsViewTreeObserverFirst;
+    private LinearLayout mItemHlinearLayout;
+    private LinearLayout mLineTopCon;
+    private View mLineBottomView;
 
     @Keep
     public void main(final Context context, final XC_LoadPackage.LoadPackageParam lpparam) {
@@ -306,7 +309,6 @@ private void doSettingsMenuInject(final Activity activity) {
             return;
         }
         View itemView = ViewUtil.findViewByName(activity, activity.getPackageName(), "v_setting_page_item");
-
         LinearLayout linearLayout = (LinearLayout) itemView.getParent();
         linearLayout.setPadding(0, 0, 0, 0);
         List<ViewGroup.LayoutParams> childViewParamsList = new ArrayList<>();
@@ -320,21 +322,30 @@ private void doSettingsMenuInject(final Activity activity) {
 
         linearLayout.removeAllViews();
 
-        LinearLayout lineTopCon = new LinearLayout(activity);
-        lineTopCon.setPadding(DpUtil.dip2px(activity, 12), 0, 0, 0);
-        lineTopCon.setBackgroundColor(Color.WHITE);
+        if (mLineTopCon == null) {
+            mLineTopCon = new LinearLayout(activity);
+        } else {
+            ViewUtil.removeFromSuperView(mLineTopCon);
+        }
+        mLineTopCon.setPadding(DpUtil.dip2px(activity, 12), 0, 0, 0);
+        mLineTopCon.setBackgroundColor(Color.WHITE);
 
         View lineTopView = new View(activity);
         lineTopView.setBackgroundColor(0xFFDFDFDF);
-        lineTopCon.addView(lineTopView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
+        mLineTopCon.addView(lineTopView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
 
-        LinearLayout itemHlinearLayout = new LinearLayout(activity);
-        itemHlinearLayout.setOrientation(LinearLayout.HORIZONTAL);
-        itemHlinearLayout.setWeightSum(1);
-        itemHlinearLayout.setBackground(ViewUtil.genBackgroundDefaultDrawable(Color.WHITE));
-        itemHlinearLayout.setGravity(Gravity.CENTER_VERTICAL);
-        itemHlinearLayout.setClickable(true);
-        itemHlinearLayout.setOnClickListener(view -> new SettingsView(activity).showInDialog());
+        if (mItemHlinearLayout == null) {
+            mItemHlinearLayout = new LinearLayout(activity);
+        } else {
+            ViewUtil.removeFromSuperView(mItemHlinearLayout);
+            mItemHlinearLayout.removeAllViews();
+        }
+        mItemHlinearLayout.setOrientation(LinearLayout.HORIZONTAL);
+        mItemHlinearLayout.setWeightSum(1);
+        mItemHlinearLayout.setBackground(ViewUtil.genBackgroundDefaultDrawable(Color.WHITE));
+        mItemHlinearLayout.setGravity(Gravity.CENTER_VERTICAL);
+        mItemHlinearLayout.setClickable(true);
+        mItemHlinearLayout.setOnClickListener(view -> new SettingsView(activity).showInDialog());
 
 
         TextView itemNameText = new TextView(activity);
@@ -368,17 +379,21 @@ private void doSettingsMenuInject(final Activity activity) {
             L.e(e);
         }
 
-        itemHlinearLayout.addView(itemNameText, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1));
-        itemHlinearLayout.addView(itemSummerText, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        mItemHlinearLayout.addView(itemNameText, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1));
+        mItemHlinearLayout.addView(itemSummerText, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-        View lineBottomView = new View(activity);
-        lineBottomView.setBackgroundColor(0xFFDFDFDF);
+        if (mLineBottomView == null) {
+            mLineBottomView = new View(activity);
+        } else {
+            ViewUtil.removeFromSuperView(mLineBottomView);
+        }
+        mLineBottomView.setBackgroundColor(0xFFDFDFDF);
 
-        linearLayout.addView(lineTopCon, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        linearLayout.addView(itemHlinearLayout, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dip2px(activity, 44)));
+        linearLayout.addView(mLineTopCon, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        linearLayout.addView(mItemHlinearLayout, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dip2px(activity, 44)));
         LinearLayout.LayoutParams lineParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1);
         lineParams.bottomMargin = DpUtil.dip2px(activity, 10);
-        linearLayout.addView(lineBottomView, lineParams);
+        linearLayout.addView(mLineBottomView, lineParams);
 
         for (int i = 0; i < childViewCount; i++) {
             View view = childViewList.get(i);

app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java

@@ -411,8 +411,6 @@ private static class PayDialog {
         @Nullable
         private TextView titleTextView;
 
-
-
         @Nullable
         public static PayDialog findFrom(ViewGroup rootView) {
             try {