将部分fragment更新为Activity,提高稳定性

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.brady.jlulife"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 6
-        versionName "0.1.6"
+        versionCode 7
+        versionName "0.1.7"
     }
     buildTypes {
         release {

app/src/main/AndroidManifest.xml

@@ -11,10 +11,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_laucher"
         android:label="@string/app_name"
         android:theme="@style/CustomActionBarTheme" >
-
         <service
             android:name="com.umeng.update.net.DownloadingService"
             android:process=":DownloadingService" >
@@ -33,15 +32,37 @@
             android:value="test" />
 
         <activity
-            android:name=".SlidingMenuMainActivity"
+            android:name=".Activities.SlidingMenuMainActivity"
             android:label="@string/app_name"
-            android:theme="@style/CustomActionBarTheme">
+            android:theme="@style/CustomActionBarTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".Activities.UIMSAuthActivity"
+            android:label="@string/title_activity_uimsauth" >
+        </activity>
+        <activity
+            android:name=".Activities.SemSelectActivity"
+            android:label="@string/title_activity_sem_select" >
+        </activity>
+        <activity android:name=".Activities.CJCXAuthActivity"
+            android:label="教务登陆" >
+
+        </activity>
+        <activity android:name=".Activities.JLUNewsListActivity"
+            android:label="校内通知"/>
+        <activity android:name=".Activities.JWNewsListActivity"
+            android:label="教务通知"/>
+        <activity android:name=".Activities.LibrarySearchActivity"
+            android:label="图书馆"/>
+        <activity android:name=".Activities.DrcomLoginActivity"
+            android:label="校园网登陆"/>
+        <activity android:name=".Activities.ScoreListActivity"
+            android:label="成绩查询"/>
     </application>
 
 </manifest>

app/src/main/java/com/brady/jlulife/Activities/BaseActivity.java

@@ -0,0 +1,41 @@
+package com.brady.jlulife.Activities;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public abstract class BaseActivity extends AppCompatActivity{
+/*    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initActionBar();
+    }*/
+
+    public void initActionBar(){
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        if(toolbar == null){
+            Log.e("ttt","toolbar is null");
+        }
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayShowTitleEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        initFragment();
+        initActionBar();
+    }
+
+    public abstract void initFragment();
+}

app/src/main/java/com/brady/jlulife/Activities/CJCXAuthActivity.java

@@ -0,0 +1,21 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.CjcxAuthFragment;
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class CJCXAuthActivity extends BaseActivity {
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, CjcxAuthFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/DrcomLoginActivity.java

@@ -0,0 +1,22 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.Fragments.ScoreListFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class DrcomLoginActivity extends BaseActivity {
+
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, DrcomLoginFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/JLUNewsListActivity.java

@@ -0,0 +1,21 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.Fragments.News.JLUNewsListFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class JLUNewsListActivity extends BaseActivity{
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, JLUNewsListFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/JWNewsListActivity.java

@@ -0,0 +1,21 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.Fragments.News.JWNewsListFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class JWNewsListActivity extends BaseActivity{
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, JWNewsListFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/LibrarySearchActivity.java

@@ -0,0 +1,31 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.Fragments.LibrarySearchFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class LibrarySearchActivity extends BaseActivity {
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, LibrarySearchFragment.getInstance());
+        transaction.commit();
+    }
+
+    @Override
+    public void onBackPressed() {
+        LibrarySearchFragment fragment = LibrarySearchFragment.getInstance();
+        if(fragment.isAdded()&&fragment.canGoBack()){
+            LibrarySearchFragment.getInstance().preformBack();
+        }else {
+            super.onBackPressed();
+        }
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/LoginSuccessActivity.java

@@ -0,0 +1,21 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.DrcomLoginFragment;
+import com.brady.jlulife.Fragments.LoginSuccessFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class LoginSuccessActivity extends BaseActivity {
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, LoginSuccessFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/ScoreListActivity.java

@@ -0,0 +1,21 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+import com.brady.jlulife.Fragments.ScoreListFragment;
+import com.brady.jlulife.R;
+
+/**
+ * Created by brady on 15-11-30.
+ */
+public class ScoreListActivity extends BaseActivity {
+
+    @Override
+    public void initFragment() {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, ScoreListFragment.getInstance());
+        transaction.commit();
+    }
+}

app/src/main/java/com/brady/jlulife/Activities/SemSelectActivity.java

@@ -0,0 +1,51 @@
+package com.brady.jlulife.Activities;
+
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.brady.jlulife.Fragments.ClassSyncFragment;
+import com.brady.jlulife.Fragments.SemSelectFragment;
+import com.brady.jlulife.R;
+
+public class SemSelectActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle("同步学期");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_sem_select, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void initFragment(){
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.main_container, SemSelectFragment.getInstance());
+        transaction.commit();
+    }
+}