去除pdf功能

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -23,7 +23,6 @@ import com.common.preferences.SharedUtil;
 import com.facebook.stetho.Stetho;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechUtility;
-import com.lidroid.xutils.DbUtils;
 import com.lidroid.xutils.HttpUtils;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
 import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
@@ -35,9 +34,12 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
+
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.PlatformConfig;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
+
+
 import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
@@ -59,16 +61,14 @@ import java.io.File;
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 public class MyApplication extends BaseApplication {
-    /**
-     * @注释：记录Cookie
-     */
+  
     public String JSESSION_B2B;
-    public static Cookie cookie;
+//    public static Cookie cookie;
     public static Cookie cookieERP;
 
     public static RequestQueue mRequestQueue;
     public static HttpUtils mHttpUtils;
-    public static DbUtils mDbUtils;
+   
 
     private static MyApplication INSTANCE = null;
 
@@ -435,13 +435,13 @@ public class MyApplication extends BaseApplication {
         JSESSION_B2B = jSESSION_B2B;
     }
 
-    public static Cookie getCookie() {
-        return cookie;
-    }
-
-    public static void setCookie(Cookie cookie) {
-        MyApplication.cookie = cookie;
-    }
+//    public static Cookie getCookie() {
+//        return cookie;
+//    }
+//
+//    public static void setCookie(Cookie cookie) {
+//        MyApplication.cookie = cookie;
+//    }
 
     public void clearWebViewCache() {
         Log.i("clearWebViewCache", "clearWebViewCache");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/UserCheckedActivity.java

@@ -8,13 +8,14 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.sp.UserSp;
+import com.core.base.ActivityStack;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.ui.base.ActivityStack;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+
 
 /**
  * 进入到此界面的Activity只可能是4中用户状态 STATUS_USER_TOKEN_OVERDUE //本地Token过期 STATUS_USER_NO_UPDATE //数据不完整

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -21,6 +21,7 @@ import com.common.preferences.PreferenceUtils;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
+
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
@@ -143,7 +144,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void login() {
-        MyApplication.cookie = null;
+   
         final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
         final String password = mPasswordEdit.getText().toString().trim();
         PreferenceUtils.putString(this, PASS_WORDS, password);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginHistoryActivity.java

@@ -16,21 +16,21 @@ import android.widget.TextView;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.hmac.Md5Util;
-import com.common.ui.ProgressDialogUtil;
 import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.core.base.ActivityStack;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult.Login;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.ActivityStack;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/StackActivity.java

@@ -3,14 +3,11 @@ package com.xzjmyk.pm.activity.ui.base;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
+import com.core.base.ActivityStack;
 import com.xzjmyk.pm.activity.MyApplication;
 
-/**
- * 加入了堆栈的Activity
- * 
- * @author Dean Tao
- * 
- */
+
+
 public class StackActivity extends DefaultResourceActivity {
 
 	@Override

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -0,0 +1,36 @@
+package com.core.app;
+
+import com.android.volley.RequestQueue;
+import com.common.config.BaseApplication;
+import com.lidroid.xutils.HttpUtils;
+
+/**
+ * Created by Arison on 2017/8/25.
+ */
+
+public class MyApplication extends BaseApplication {
+
+    private static MyApplication INSTANCE = null;
+    public String JSESSION_B2B;
+    public static RequestQueue mRequestQueue;
+    public static HttpUtils mHttpUtils;
+
+   
+
+    
+    
+    @Override
+    public void initConfig() throws Exception {
+        
+    }
+
+    public void destory() {
+        
+        
+    }
+
+
+    public static MyApplication getInstance() {
+        return INSTANCE;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/ActivityStack.java → app_core/common/src/main/java/com/core/base/ActivityStack.java

@@ -1,12 +1,15 @@
-package com.xzjmyk.pm.activity.ui.base;
+package com.core.base;
 
 import android.app.Activity;
 
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
-
 import java.util.Stack;
 
+/**
+ * Created by Arison on 2017/8/25.
+ */
+
 public class ActivityStack {
+
     private Stack<Activity> stack;
     private static ActivityStack instance;
 
@@ -50,29 +53,4 @@ public class ActivityStack {
             }
         }
     }
-    // public void popAllActivityExceptOne(Class cls) {
-    // while (true) {
-    // Activity activity = currentActivity();
-    // if (activity == null) {
-    // break;
-    // }
-    // if (activity.getClass().equals(cls)) {
-    // break;
-    // }
-    // popActivity(activity);
-    // }
-    // }
-    //
-    // public void popActivity() {
-    // Activity activity = activityStack.lastElement();
-    // if (activity != null) {
-    // activity.finish();
-    // activity = null;
-    // }
-    // }
-    //
-    // private Activity currentActivity() {
-    // Activity activity = activityStack.lastElement();
-    // return activity;
-    // }
 }

app_core/common/src/main/java/com/core/base/DefaultResourceActivity.java

@@ -0,0 +1,19 @@
+package com.core.base;
+
+import android.content.res.Configuration;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by Arison on 2017/8/25.
+ */
+public class DefaultResourceActivity extends AppCompatActivity {
+    /* System default config */
+    private static Configuration config = new Configuration();
+
+//    @Override
+//    public Resources getResources() {
+//        Resources res = super.getResources();
+//        res.updateConfiguration(config, res.getDisplayMetrics());
+//        return res;
+//    }
+}

app_core/common/src/main/java/com/core/base/StackActivity.java

@@ -0,0 +1,28 @@
+package com.core.base;
+
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+
+import com.core.app.MyApplication;
+
+
+public class StackActivity extends DefaultResourceActivity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+		ActivityStack.getInstance().push(this);
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		ActivityStack.getInstance().pop(this);
+		if (isFinishing()) {
+			if (!ActivityStack.getInstance().has()) {
+				MyApplication.getInstance().destory();
+			}
+		}
+	}
+}