Merge pull request #6 from Feirty/master

毕设

src/HomeWork/HomeWorkInAndroid/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

src/HomeWork/HomeWorkInAndroid/README.md

@@ -0,0 +1 @@
+# HomeWorkInAndroid

src/MailIM/客户端/MailIM/app/build.gradle → src/HomeWork/HomeWorkInAndroid/app/build.gradle

@@ -1,17 +1,16 @@
 apply plugin: 'com.android.application'
-
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 24 //24
+    buildToolsVersion  "25.0.2"//"25.0.2"
     aaptOptions {
                  cruncherEnabled = false
                  useNewCruncher = false
 
     }
     defaultConfig {
-        applicationId "com.hzu.feirty.tabmenu"
+        applicationId "io.github.leibnik.GradualRadioBar"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 24  //24
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,12 +29,15 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:24.2.1'
+    //compile 'com.android.support:appcompat-v7:23.3.0'
     testCompile 'junit:junit:4.12'
+    compile 'com.android.support:recyclerview-v7:24.0.0'
+    //compile 'com.android.support:recyclerview-v7:23.0.0'
+    compile 'com.android.support:design:22.2.0'
+    compile project(':gradualradiobar')
     compile files('libs/activation.jar')
     compile files('libs/additionnal.jar')
     compile files('libs/mail.jar')
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.android.support.test.espresso:espresso-core:2.2.2'
     compile files('libs/android-async-http-1.4.6.jar')
     compile files('libs/asmack-android-6.jar')
     compile files('libs/gson-2.5.jar')

src/MailIM/客户端/MailIM/app/src/androidTest/java/com/hzu/feirty/MailIM/ExampleInstrumentedTest.java → src/HomeWork/HomeWorkInAndroid/app/src/androidTest/java/com/hzu/feirty/HomeWork/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.hzu.feirty.MailIM;
+package com.hzu.feirty.HomeWork;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

src/HomeWork/HomeWorkInAndroid/app/src/main/AndroidManifest.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.hzu.feirty.HomeWork">
+
+    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="21" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- 存储器写入权限 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- 挂载文件系统权限 -->
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name="com.hzu.feirty.HomeWork.activity.index.MailApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="收发作业"
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
+        <activity android:name="com.hzu.feirty.HomeWork.activity.index.LoginActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+        </activity>
+        <activity
+            android:name="com.hzu.feirty.HomeWork.activity.MainActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.funcation.SendWorkActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.main.ItemContentActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.index.RegisterActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.TeacherSetActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.StudentSetActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.SetActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.MainActivityDemo" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.funcation.AllCourseActivity"/>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.funcation.AllSchoolActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mission.WorkContentActivity"/>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.CourseActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.SchoolActivity"/>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.TeacherActivity"/>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.TaskActivity" />
+        <activity android:name="com.hzu.feirty.HomeWork.activity.funcation.SendCourseActivity"/>
+        <activity android:name="com.hzu.feirty.HomeWork.activity.mycenter.WorkActivity" />
+        <activity android:name=".activity.funcation.SeleteCourseActivity"/>
+        <activity android:name=".activity.mycenter.StudentActivity" />
+        <activity android:name=".activity.mycenter.StudentTableActivity" />
+        <activity android:name=".activity.funcation.WorkStateActivity" />
+    </application>
+</manifest>

src/MailIM/客户端/MailIM/app/src/main/java/com/hzu/feirty/MailIM/activity/MainActivity.java → src/HomeWork/HomeWorkInAndroid/app/src/main/java/com/hzu/feirty/HomeWork/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.hzu.feirty.MailIM.activity;
+package com.hzu.feirty.HomeWork.activity;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -11,11 +11,10 @@
 import android.widget.RadioGroup.OnCheckedChangeListener;
 import android.widget.TabHost;
 import android.widget.Toast;
+import com.hzu.feirty.HomeWork.R;
 
-import com.hzu.feirty.MailIM.R;
 
 public class MainActivity extends AppCompatActivity {
-	// tab用参数
 	private TabHost tabHost;
 	private long exitTime = 0;
 	private RadioGroup radiogroup;
@@ -24,8 +23,9 @@ public class MainActivity extends AppCompatActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
-		getSupportActionBar().setTitle("收发作业");
+		//getSupportActionBar().setTitle("收发作业");
 		radiogroup = (RadioGroup) findViewById(R.id.radiogroup);
+		//radiogroup01 = (GradualRadioGroup) findViewById(R.id.radiogroup);
 		tabHost = (TabHost) findViewById(android.R.id.tabhost);
 		tabHost.setup();
 		tabHost.addTab(tabHost.newTabSpec("main").setIndicator("main")
@@ -45,17 +45,27 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
 						tabHost.setCurrentTabByTag("main");
 						//如果需要动画效果就使用
 						setCurrentTabWithAnim(currentTab, 0, "main");
-						getSupportActionBar().setTitle("收发作业");
+						//getSupportActionBar().setTitle("收发作业");
+						if (getSupportActionBar() != null){
+							getSupportActionBar().hide();
+						}
 						break;
 					case R.id.radio_mycenter:
-						//tabHost.setCurrentTabByTag("mycenter");
+						tabHost.setCurrentTabByTag("mycenter");
 						setCurrentTabWithAnim(currentTab, 1, "mycenter");
-						getSupportActionBar().setTitle("个人中心");
+						//getSupportActionBar().setTitle("个人中心");
+						if (getSupportActionBar() != null){
+							getSupportActionBar().hide();
+						}
 
 						break;
 					case R.id.radio_search:
 						tabHost.setCurrentTabByTag("search");
-						getSupportActionBar().setTitle("发现");
+						setCurrentTabWithAnim(currentTab, 2, "search");
+						//getSupportActionBar().setTitle("发现");
+						if (getSupportActionBar() != null){
+							getSupportActionBar().hide();
+						}
 				}
 				// 刷新actionbar的menu
 				getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
@@ -70,7 +80,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 		switch (menuid) {
 			case R.id.radio_main:
-				getMenuInflater().inflate(R.menu.main, menu);
+				getMenuInflater().inflate(R.menu.work_toolbar_menu, menu);
 				break;
 			case R.id.radio_mycenter:
 				menu.clear();
@@ -106,22 +116,6 @@ private void setCurrentTabWithAnim(int now, int next, String tag) {
 			tabHost.getCurrentView().startAnimation(AnimationUtils.loadAnimation(this, R.anim.push_left_in));
 		}
 	}
-/*	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if(keyCode == KeyEvent.KEYCODE_BACK){
-			long firstClickBack=System.currentTimeMillis();
-			long secondClickBack = System.currentTimeMillis();
-			if(secondClickBack - firstClickBack >1500){
-				Toast.makeText(this, "再按一次退出每一天", Toast.LENGTH_SHORT).show();
-				firstClickBack = secondClickBack;
-				return true;
-			}else{
-				MyApplication.getInstance().exitApp();
-				return true;
-			}
-		}
-		return super.onKeyDown(keyCode, event);
-	}*/
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if(keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN){

src/HomeWork/HomeWorkInAndroid/app/src/main/java/com/hzu/feirty/HomeWork/activity/MainActivityDemo.java

@@ -0,0 +1,53 @@
+package com.hzu.feirty.HomeWork.activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import java.util.ArrayList;
+import java.util.List;
+import io.github.leibnik.gradualradiobar.GradualRadioGroup;
+import com.hzu.feirty.HomeWork.R;
+import com.hzu.feirty.HomeWork.fragment.FunctionFragment;
+import com.hzu.feirty.HomeWork.fragment.MainFragment;
+import com.hzu.feirty.HomeWork.fragment.MissionFragment;
+import com.hzu.feirty.HomeWork.fragment.MyCenterFragment;
+
+public class MainActivityDemo extends AppCompatActivity {
+    private ViewPager viewPager;
+    private GradualRadioGroup gradualRadioGroup;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_maindemo);
+        viewPager = (ViewPager) findViewById(R.id.viewpager);
+        gradualRadioGroup = (GradualRadioGroup) findViewById(R.id.radiobar);
+        List<Fragment> list = new ArrayList<>();
+        list.add(new MainFragment());
+        list.add(new MissionFragment());
+        list.add(new FunctionFragment());
+        list.add(new MyCenterFragment());
+        viewPager.setAdapter(new DemoPagerAdapter(getSupportFragmentManager(), list));
+        viewPager.setOffscreenPageLimit(3);
+        gradualRadioGroup.setViewPager(viewPager);
+    }
+    class DemoPagerAdapter extends FragmentPagerAdapter {
+        List<Fragment> mData;
+        public DemoPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+        public DemoPagerAdapter(FragmentManager fm, List<Fragment> data) {
+            super(fm);
+            mData = data;
+        }
+        @Override
+        public Fragment getItem(int position) {
+            return mData.get(position);
+        }
+        @Override
+        public int getCount() {
+            return mData.size();
+        }
+    }
+}