Merge pull request #365 from ghbhaha/master

使用tag代替id解决一些兼容问题

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java

@@ -221,9 +221,7 @@ class DoraemonKitReal {
                 }
 
                 //设置app的直接子view的Id
-                if (UIUtils.getDokitAppContentView(activity) != null) {
-                    UIUtils.getDokitAppContentView(activity).setId(R.id.dokit_app_contentview_id);
-                }
+                UIUtils.getDokitAppContentView(activity);
 
 
                 if (DokitConstant.IS_NORMAL_FLOAT_MODE) {

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/UIUtils.java

@@ -202,22 +202,22 @@ public class UIUtils {
      * @return
      */
     public static View getDokitAppContentView(Activity activity) {
-        View mAppContentView = activity.findViewById(R.id.dokit_app_contentview_id);
+        FrameLayout decorView = (FrameLayout) activity.getWindow().getDecorView();
+        View mAppContentView = (View) decorView.getTag(R.id.dokit_app_contentview_id);
         if (mAppContentView != null) {
             return mAppContentView;
         }
-        FrameLayout decorView = (FrameLayout) activity.getWindow().getDecorView();
-
         for (int index = 0; index < decorView.getChildCount(); index++) {
             View child = decorView.getChildAt(index);
             //LogHelper.i(TAG, "childId=====>" + getIdText(child));
             //解决与布局边框工具冲突的问题
-            if ((child instanceof LinearLayout && TextUtils.isEmpty(getIdText(child).trim())) || child instanceof FrameLayout) {
+            if ((child instanceof LinearLayout) || child instanceof FrameLayout) {
                 if (getIdText(child).trim().equals(STR_VIEW_BORDER_Id)) {
                     mAppContentView = ((ViewBorderFrameLayout) child).getChildAt(0);
                 } else {
                     mAppContentView = child;
                 }
+                decorView.setTag(R.id.dokit_app_contentview_id, mAppContentView);
                 break;
             }
         }