5.7.1 15:46

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

@@ -53,7 +53,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
             db.execSQL(Constants.TABLE_MISSION);//外勤计划
             db.execSQL(Constants.WORK_LOCATION);//
             db.execSQL(Constants.EM_ERPNEWS);//
-            db.execSQL(Constants.CREATE_BANNER);//
+//            db.execSQL(Constants.CREATE_BANNER);//
         } catch (Exception e) {
 
         }
@@ -91,7 +91,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS workdata");
         db.execSQL("DROP TABLE IF EXISTS work_location");
         db.execSQL("DROP TABLE IF EXISTS em_erpnews");
-        db.execSQL("DROP TABLE IF EXISTS step");
+//        db.execSQL("DROP TABLE IF EXISTS step");
     }
 
     /**

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

@@ -166,11 +166,11 @@ public class Constants {
             + ")";
 
 
-    //用于创建Banner表
-    public static final String CREATE_BANNER = "create table step ("
-            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + "curDate TEXT, "
-            + "totalSteps TEXT)";
+//    //用于创建Banner表
+//    public static final String CREATE_BANNER = "create table step ("
+//            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+//            + "curDate TEXT, "
+//            + "totalSteps TEXT)";
 
     //已订阅号表
     public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDBOpenHelper.java

@@ -0,0 +1,37 @@
+package com.xzjmyk.pm.newpedo.db;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/**
+ * Created by fySpring
+ * Date : 2017/1/16
+ * To do :
+ */
+
+public class StepDBOpenHelper extends SQLiteOpenHelper {
+    private static final String DB_NAME = "StepCounter.db"; //数据库名称
+    private static final int DB_VERSION = 1;//数据库版本,大于0
+
+    //用于创建Banner表
+    private static final String CREATE_BANNER = "create table step ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "curDate TEXT, "
+            + "totalSteps TEXT)";
+
+
+    public StepDBOpenHelper(Context context) {
+        super(context, DB_NAME, null,DB_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(CREATE_BANNER);//执行有更改的sql语句
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDataDao.java

@@ -5,22 +5,23 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by FANGLH
- * Date : 2017/4/13
+ * Created by fySpring
+ * Date : 2017/3/24
  * To do :
  */
 
 public class StepDataDao {
+    private StepDBOpenHelper stepHelper;
+    private SQLiteDatabase stepDb;
 
     public StepDataDao(Context context) {
-
+        stepHelper = new StepDBOpenHelper(context);
     }
 
     /**
@@ -29,13 +30,14 @@ public class StepDataDao {
      * @param stepEntity
      */
     public void addNewData(StepEntity stepEntity) {
-        //TODO 获取db的方式统一使用这个，以后的方法里面使用到db的也用这个方式获取，不然有可能出现闪退
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
+
         ContentValues values = new ContentValues();
         values.put("curDate", stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.insert("step", null, values);
-        DatabaseManager.getInstance().closeDatabase();
+
+        stepDb.close();
     }
 
     /**
@@ -45,7 +47,7 @@ public class StepDataDao {
      * @return
      */
     public StepEntity getCurDataByDate(String curDate) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
         StepEntity stepEntity = null;
         Cursor cursor = stepDb.query("step", null, null, null, null, null, null);
         while (cursor.moveToNext()) {
@@ -58,8 +60,8 @@ public class StepDataDao {
             }
         }
         //关闭
+        stepDb.close();
         cursor.close();
-        DatabaseManager.getInstance().closeDatabase();
         return stepEntity;
     }
 
@@ -70,7 +72,7 @@ public class StepDataDao {
      */
     public List<StepEntity> getAllDatas() {
         List<StepEntity> dataList = new ArrayList<>();
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
         Cursor cursor = stepDb.rawQuery("select * from step", null);
 
         while (cursor.moveToNext()) {
@@ -81,25 +83,24 @@ public class StepDataDao {
         }
 
         //关闭数据库
+        stepDb.close();
         cursor.close();
-        DatabaseManager.getInstance().closeDatabase();
         return dataList;
     }
 
     /**
      * 更新数据
-     *
      * @param stepEntity
      */
     public void updateCurData(StepEntity stepEntity) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
 
         ContentValues values = new ContentValues();
-        values.put("curDate", stepEntity.getCurDate());
+        values.put("curDate",stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.update("step", values, "curDate=?", new String[]{stepEntity.getCurDate()});
 
-        DatabaseManager.getInstance().closeDatabase();
+        stepDb.close();
     }
 
 
@@ -109,10 +110,10 @@ public class StepDataDao {
      * @param curDate
      */
     public void deleteCurData(String curDate) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
 
         if (stepDb.isOpen())
             stepDb.delete("step", "curDate", new String[]{curDate});
-        DatabaseManager.getInstance().closeDatabase();
+        stepDb.close();
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepListActivity.java

@@ -1,8 +1,8 @@
 package com.xzjmyk.pm.newpedo.view;
 
-import android.support.v7.app.AlertDialog;
 import android.graphics.Paint;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,10 +10,19 @@ import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.CircleImageView;
 import com.xzjmyk.pm.activity.view.MyListView;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 import com.xzjmyk.pm.newpedo.db.StepDataDao;
 
@@ -28,14 +37,29 @@ public class NewStepListActivity extends BaseActivity {
     private UuStepNumAdapter muuStepNumAdapter;
     private StepDataDao stepDataDao;
     private List<StepEntity> stepEntityList;
+    @ViewInject(R.id.step_num_lv)
     private MyListView step_num_lv;
+    @ViewInject(R.id.steps_history_tv)
     private TextView steps_history_tv;
+    @ViewInject(R.id.steps_history_ll)
     private LinearLayout step_ll;
+    private DBManager manager;
+    @ViewInject(R.id.step_photo_im)
+    private CircleImageView step_photo_im;
+    @ViewInject(R.id.step_name_tv)
+    private TextView step_name_tv;
+    @ViewInject(R.id.step_em_ll)
+    private LinearLayout step_em_ll;
+    private String em_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+    private String em_code;
+    private Boolean platform;
 
+    //
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.newstep_data);
+        ViewUtils.inject(this);
         initView();
         initData();
         showNotice();
@@ -52,18 +76,16 @@ public class NewStepListActivity extends BaseActivity {
     private void initView() {
         muuStepNumAdapter = new UuStepNumAdapter();
         stepEntityList = new ArrayList<>();
-        step_num_lv = (MyListView) findViewById(R.id.step_num_lv);
-        steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        step_ll = (LinearLayout) findViewById(R.id.steps_history_ll);
-
         step_ll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showNotice();
             }
         });
-
+        step_ll.setVisibility(View.GONE);
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
+        manager = new DBManager(this);
     }
     private void initData() {
         //获取数据库
@@ -76,8 +98,19 @@ public class NewStepListActivity extends BaseActivity {
             muuStepNumAdapter.setStepEntityList(stepEntityList);
             step_num_lv.setAdapter(muuStepNumAdapter);
         }
-//        stepDataDao.startThread();
+
+        if (platform) {
+            em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu");
+        }
+        else {
+            em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
+        }
+        step_name_tv.setText(em_name + "");
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+
+        AvatarHelper.getInstance().display(loginUserId, step_photo_im, true, false);
     }
+
     public class UuStepNumAdapter extends BaseAdapter {
         private List<StepEntity> stepEntityList;
         public List<StepEntity> getStepEntityList() {return stepEntityList;}

WeiChat/src/main/res/layout/newstep_data.xml

@@ -12,6 +12,7 @@
         android:layout_gravity="center"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="20dp"
+        android:visibility="visible"
         >
         <ImageView
             android:layout_width="wrap_content"
@@ -29,6 +30,27 @@
             android:layout_marginLeft="10dp"
             />
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/step_em_ll"
+        android:layout_marginTop="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginLeft="50dp">
+        <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
+            android:id="@+id/step_photo_im"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/common_header_boy"/>
+        <TextView
+            android:id="@+id/step_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="名字"
+            android:layout_marginLeft="10dp"
+           android:layout_gravity="center_vertical"/>
+    </LinearLayout>
     <ScrollView
         android:layout_marginLeft="35dp"
         android:layout_marginRight="35dp"