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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -198,12 +198,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
     @Override
     public void preOnCreacte() {
-        setTheme(R.style.CrmThemeVisit);
-        Log.i(TAG, "preOnCreacte:");
+
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (getIntent() != null && getIntent().getIntExtra("type", 0) == 1)
+            setTheme(R.style.CrmThemeVisit);
         super.onCreate(savedInstanceState);
         Log.i(TAG, "onCreate:");
         setContentView(R.layout.activity_oa);