Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java

@@ -348,16 +348,6 @@ private int agree_type = 0;
         int h_screen = dm.heightPixels;
         w_screen = DisplayUtil.dip2px(this, 300);
         h_screen = DisplayUtil.dip2px(this, 185);
-
-        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
-        popupWindow.setTouchable(true);
-        popupWindow.setOutsideTouchable(false);
-        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
-        // 设置好参数之后再show
-        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
-        setbg(0.4f);
-
         contentView.findViewById(R.id.jump_step_ll).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -380,6 +370,16 @@ private int agree_type = 0;
 
             }
         });
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
+//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
+
+
     }
     private void setbg(float alpha) {
         setBackgroundAlpha(this, alpha);