diff --git a/app/libs/processor.jar b/app/libs/processor.jar index bb4f539..46b1996 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index df8a244..60fb2bc 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -19,7 +19,6 @@ import com.share.mvpsdk.global.GlobalApplication; import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.shunzhi.parent.bean.message.DaoMaster; import com.shunzhi.parent.bean.message.DaoSession; -import com.shunzhi.parent.db.DBControl; import com.shunzhi.parent.dbhelper.GreenDaoDatabaseOpenHelper; import com.shunzhi.parent.manager.MessageManager; import com.shunzhi.parent.ui.MainActivity; @@ -63,7 +62,6 @@ public class AppContext extends GlobalApplication { appContext = this; super.onCreate(); - DBControl.init(appContext); NIMClient.init(this, loginInfo(), options()); if (inMainProcess(this)) { //开启地图地位 diff --git a/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java b/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java deleted file mode 100644 index 01b8fb8..0000000 --- a/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.shunzhi.parent.db; - -import android.content.Context; - -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.QueryBuilder; -import com.shunzhi.parent.bean.ChildBean; -import com.shunzhi.parent.util.DatabaseHelper; - -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by Administrator on 2018/4/19 0019. - */ - -public class ChildInfoDao { - private Context context; - private DatabaseHelper databaseHelper; - private Dao dao; - - public ChildInfoDao(Context context) { - this.context = context; - try { - databaseHelper = DatabaseHelper.getHelper(context); - dao = databaseHelper.getDao(ChildBean.class); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - public boolean createOrUpdate(ChildBean childBean){ - try { - return dao.createOrUpdate(childBean).getNumLinesChanged() > 0; - } catch (SQLException e) { - e.printStackTrace(); - return false; - } - } - - - public boolean onCreate(ChildBean childBean) { - try { - return dao.create(childBean) > 0; - } catch (SQLException e) { - e.printStackTrace(); - return false; - } - } - - public boolean deleteAll(){ - try { - DeleteBuilder builder = dao.deleteBuilder(); - return dao.delete(builder.prepare())>0; - } catch (SQLException e) { - e.printStackTrace(); - return false; - } - } - public synchronized List getAllChildren() { - List children = null; - try { - children = dao.queryForAll(); - if (children != null && children.size() > 0) return children; - } catch (SQLException e) { - e.printStackTrace(); - return new ArrayList<>(); - } - return new ArrayList<>(); - } - - - public synchronized ChildBean getChildBystudentId(int studentId) { - QueryBuilder queryBuilder = dao.queryBuilder(); - try { - queryBuilder.where().eq("studentId", studentId); - List list = dao.query(queryBuilder.prepare()); - ChildBean studentInfo = list.get(0); - return studentInfo; -// return dao.queryForFirst(queryBuilder.prepare()); - } catch (SQLException e) { - e.printStackTrace(); - return null; - } - } - - } diff --git a/app/src/main/java/com/shunzhi/parent/db/DBControl.java b/app/src/main/java/com/shunzhi/parent/db/DBControl.java deleted file mode 100644 index a19472e..0000000 --- a/app/src/main/java/com/shunzhi/parent/db/DBControl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.shunzhi.parent.db; - -import android.content.Context; - -/** - * Created by Administrator on 2018/4/19 0019. - */ - -public class DBControl { - public static ChildInfoDao childInfoDao; - - public static void init(Context context){ - childInfoDao=new ChildInfoDao(context); - } -} diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java index 0ac32d7..1ac8a34 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java @@ -22,7 +22,6 @@ import com.shunzhi.parent.bean.ChildBean; import com.shunzhi.parent.bean.ChildClass; import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.contract.mine.MyChildContract; -import com.shunzhi.parent.db.DBControl; import com.shunzhi.parent.presenter.mine.MyChildPresenter; import com.shunzhi.parent.ui.activity.binding.SelectSchoolActivity; import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; @@ -103,10 +102,6 @@ public class MyChildActivity extends BaseMVPCompatActivity list = currentBean.getStudentClass(); - for(int i=0;i + implements MyChildContract.IMyChildView, View.OnClickListener { ViewPager viewPager; TextView tvDate, tvShaiXuan, tvNoData, tvName; @@ -41,6 +46,8 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi TabLayout tabLayout; + RelativeLayout rl_noData; + ChengZhangFragment chengZhangFragment1 = null, chengZhangFragment2 = null;//成长、报告页面 ShaiXuanPop shaiXuanPop = null; @@ -62,25 +69,11 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi tvShaiXuan = view.findViewById(R.id.tvShaiXuan); tvNoData = view.findViewById(R.id.tvNoData); tabLayout = view.findViewById(R.id.tabLayout); + rl_noData = view.findViewById(R.id.rl_noData); tvName.setOnClickListener(this); tvName.setEllipsize(TextUtils.TruncateAt.END); tvShaiXuan.setOnClickListener(this); - myFragmentAdapter = new MyFragmentAdapter(getChildFragmentManager()); - - childlist = DBControl.childInfoDao.getAllChildren(); - createSchoolMenu(); - String currChildStr = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.CURRCHILDJSONSTR); - if (TextUtils.isEmpty(currChildStr)) { - if (childlist != null && childlist.size() > 0) { - tvName.setText(childlist.get(0).getStudentName()); - jsonStr = g.toJson(childlist.get(0), ChildBean.class); - } - } else { - ChildBean childBean = g.fromJson(currChildStr, ChildBean.class); - tvName.setText(childBean.getStudentName()); - jsonStr = currChildStr; - } viewPager.setAdapter(myFragmentAdapter); tabLayout.setupWithViewPager(viewPager); tabLayout.removeAllTabs(); @@ -106,6 +99,13 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi } + + @Override + public void onResume() { + super.onResume(); + mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, ""); + } + @Override public void onClick(View view) { switch (view.getId()) { @@ -138,6 +138,7 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi tvName.setText(item.getTitle()); jsonStr = g.toJson(childlist.get(finalI), ChildBean.class); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr); + myFragmentAdapter.notifyDataSetChanged(); return false; } }); @@ -160,6 +161,64 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi if (handler != null) handler = null; } + @NonNull + @Override + public BasePresenter initPresenter() { + return new MyChildPresenter(); + } + + + @Override + public void updateChildList(CurrentBean currentBean) { + childlist.clear(); + if (currentBean != null) { + List list = currentBean.getStudentClass(); + String currChildStr = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.CURRCHILDJSONSTR); + childlist.addAll(list); + + if (childlist == null || childlist.size() == 0) { + rl_noData.setVisibility(View.VISIBLE); + viewPager.setVisibility(View.GONE); + } + if (TextUtils.isEmpty(currChildStr)) { + if (childlist != null && childlist.size() > 0) { + tvName.setText(childlist.get(0).getStudentName()); + jsonStr = g.toJson(childlist.get(0), ChildBean.class); + } + } else { + ChildBean childBean = g.fromJson(currChildStr, ChildBean.class); + for (int i = 0; i < childlist.size(); i++) { + if (childBean.getStudentId() == childlist.get(i).getStudentId()) { + jsonStr = g.toJson(childlist.get(i), ChildBean.class); + break; + } + } + tvName.setText(childBean.getStudentName()); + } + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr); + createSchoolMenu(); + } + + } + + @Override + public void addChildSuccess(String account, String password) { + + } + + @Override + public void showClass(List list) { + + } + + @Override + public void showError(String error) { + if (error.equals("访问的接口要求登录")) { + rl_noData.setVisibility(View.VISIBLE); + viewPager.setVisibility(View.GONE); + } + } + private class MyFragmentAdapter extends FragmentPagerAdapter { public MyFragmentAdapter(FragmentManager fm) { diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java index 629a27a..6e375b2 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java @@ -1,6 +1,5 @@ package com.shunzhi.parent.ui.fragment.apply; -import android.app.DatePickerDialog; import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; @@ -10,16 +9,11 @@ import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.View; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.DatePicker; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import com.bigkoo.pickerview.builder.TimePickerBuilder; -import com.bigkoo.pickerview.listener.CustomListener; import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener; import com.bigkoo.pickerview.listener.OnTimeSelectListener; import com.bigkoo.pickerview.view.TimePickerView; @@ -27,16 +21,13 @@ import com.google.gson.Gson; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.share.mvpsdk.utils.ToastUtils; -import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.AttendanceAdapter; import com.shunzhi.parent.bean.ChildBean; -import com.shunzhi.parent.bean.ToolBean; import com.shunzhi.parent.bean.apply.AttendanceBean; import com.shunzhi.parent.contract.apply.ApplySigninContract; import com.shunzhi.parent.presenter.apply.ApplySigninPresenter; -import java.sql.Time; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -81,10 +72,10 @@ public class ApplySigninFragment extends BaseMVPCompatFragment daos = new HashMap(); - private static DatabaseHelper instance; - - public DatabaseHelper(Context context){ - super(context,TABLE_NAME,null,1); - } - - /* - 创建数据库 - */ - @Override - public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) { - try { - TableUtils.createTableIfNotExists(connectionSource, ChildBean.class); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - @Override - public void onUpgrade(SQLiteDatabase database, ConnectionSource connectionSource, int oldVersion, int newVersion) { - try { - TableUtils.dropTable(connectionSource,ChildBean.class,true); - onCreate(database,connectionSource); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - //删除数据库 - public void deleteAll(){ - try { - TableUtils.dropTable(connectionSource,ChildBean.class,true); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - public static synchronized DatabaseHelper getHelper(Context context){ - context=context.getApplicationContext(); - if (null==instance){ - synchronized (DatabaseHelper.class){ - if (null==instance){ - instance=new DatabaseHelper(context); - } - } - } - return instance; - } - - public synchronized Dao getDao(Class clazz) throws SQLException { - Dao dao = null; - String className = clazz.getSimpleName(); - - if (daos.containsKey(className)) { - dao = daos.get(className); - } - if (dao == null) { - dao = super.getDao(clazz); - daos.put(className, dao); - } - return dao; - } - - /** - * 释放资源 - */ - @Override - public void close() { - super.close(); - - for (String key : daos.keySet()) - { - Dao dao = daos.get(key); - dao = null; - } - } -} diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index 6daa8a7..8b0c394 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -66,6 +66,7 @@