修改广告轮播页问题

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

@@ -117,27 +117,20 @@ public class SplashActivity extends BaseActivity {
             return;
         }
         int userStatus = LoginHelper.prepareUser(mContext);
-        Intent intent = new Intent();
         switch (userStatus) {
             case LoginHelper.STATUS_USER_FULL://5
             case LoginHelper.STATUS_USER_NO_UPDATE://3
-                intent.setClass(mContext, MainActivity.class);
+                trun2NextPage(1);
                 break;
             case LoginHelper.STATUS_USER_TOKEN_OVERDUE://2
             case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:
-                boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
-                if (isFirst) {
-                    intent.setClass(mContext, ADActivity.class);
-                } else
-                    intent.setClass(mContext, LoginActivity.class);
+                trun2NextPage(0);
                 break;
             case LoginHelper.STATUS_NO_USER://0
             default:
                 stay();
                 return;// must return
         }
-        startActivity(intent);
-        finish();
     }
 
     private void jump2() {
@@ -206,11 +199,9 @@ public class SplashActivity extends BaseActivity {
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, password, result);// 设置登陆用户信息
                 }
                 if (success) {// 登陆IM成功
-                    startActivity(new Intent(SplashActivity.this, MainActivity.class));
-                    //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+                    trun2NextPage(1);
                     String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
                     String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
-
                     if (!TextUtils.isEmpty(saved_time)) {
                         PreferenceUtils.putString(TimeStatisticsActivity.Login_In, saved_time + "," + nowtime);
                     } else {
@@ -226,15 +217,27 @@ public class SplashActivity extends BaseActivity {
     }
 
 
+    private void trun2NextPage(int type) {
+        boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
+        Intent intent = new Intent();
+        if (isFirst) {
+            intent.setClass(this, ADActivity.class);
+            intent.putExtra("type", type);
+        } else {
+            if (type == 1) {
+                intent.setClass(this, MainActivity.class);
+            } else {
+                intent.setClass(this, LoginActivity.class);
+            }
+        }
+        startActivity(intent);
+        finish();
+    }
+
     // 停留在此界面
     private void stay() {
         mSelectLv.setVisibility(View.GONE);
-        boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
-        if (isFirst) {
-            startActivity(new Intent(mContext, ADActivity.class));
-            finish();
-        } else
-            startActivity(new Intent(mContext, LoginActivity.class));
+        trun2NextPage(0);
         Animation anim = AnimationUtils.loadAnimation(this, R.anim.alpha_in);
         mSelectLv.startAnimation(anim);
     }

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

@@ -15,6 +15,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.util.LogUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -26,6 +27,7 @@ import com.xzjmyk.pm.activity.util.PreferenceUtils;
 public class ADActivity extends BaseActivity {
     private final String IS_FIRST = "IS_FIRST";
 
+    private int type;
     private final int[] IDS = {R.drawable.index_a, R.drawable.index_b, R.drawable.index_c, R.drawable.index_d};
     @ViewInject(R.id.ad_vp)
     private ViewPager ad_vp;
@@ -45,6 +47,7 @@ public class ADActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_ad);
         ViewUtils.inject(this);
+        type = getIntent().getIntExtra("type", 0);
         getSupportActionBar().hide();
         initView();
 
@@ -110,15 +113,21 @@ public class ADActivity extends BaseActivity {
                         break;
                 }
                 ad_vp.setCurrentItem(item);
-
             }
         });
+    }
 
-
+    @Override
+    public void onBackPressed() {
+        start2Next();
+        super.onBackPressed();
     }
 
     private void start2Next() {
-        startActivity(new Intent(this, LoginActivity.class));
+        if (type == 0)
+            startActivity(new Intent(this, LoginActivity.class));
+        else
+            startActivity(new Intent(this, MainActivity.class));
         PreferenceUtils.putBoolean(IS_FIRST, false);
         finish();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;