Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty

 Conflicts:

	app/src/main/AndroidManifest.xml

app/src/main/res/layout/activity_order.xml

@@ -30,7 +30,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="xx"
+                android:text="订单"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
 

app/src/main/res/values/styles.xml

@@ -130,5 +130,10 @@
         <item name="android:windowExitAnimation">@anim/dialog_dismiss</item>
 
     </style>
-
+    <!--解决微信支付回调部分机型黑屏闪烁的问题-->
+    <style name="wxPayTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
 </resources>