Merge branch 'developer' into yxb_dev

姚旭斌
2 parents 4e90fba2 d1a9fe26
Showing 3 changed files with 2 additions and 0 deletions Show diff stats
app/libs/processor.jar
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -12,6 +12,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -10,6 +10,7 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
...	...	@@ -12,6 +12,7 @@ import android.support.v4.app.FragmentManager;
12	12	import android.support.v4.app.FragmentPagerAdapter;
13	13	import android.support.v4.view.ViewPager;
14	14	import android.text.TextUtils;
	15	+import android.util.Log;
15	16	import android.view.Menu;
16	17	import android.view.MenuItem;
17	18	import android.view.View;
...	...
...	...	@@ -10,6 +10,7 @@ import android.text.Spannable;
10	10	import android.text.SpannableString;
11	11	import android.text.TextUtils;
12	12	import android.text.style.ForegroundColorSpan;
	13	+import android.util.Log;
13	14	import android.view.Gravity;
14	15	import android.view.LayoutInflater;
15	16	import android.view.View;
...	...