10:20

app_core/common/src/main/java/com/core/dao/StepRankingFirstDao.java

@@ -74,13 +74,14 @@ public class StepRankingFirstDao {
             cursor = stepDb.rawQuery("select * from StepRankingFirst", null);
             stepDb.beginTransaction();
             while (cursor.moveToNext()) {
+                int id = cursor.getInt(cursor.getColumnIndex("_id"));
                 String date = cursor.getString(cursor.getColumnIndex("date"));
                 String my_userid = cursor.getString(cursor.getColumnIndex("my_userid"));
                 String my_rank = cursor.getString(cursor.getColumnIndex("my_rank"));
                 String my_steps = cursor.getString(cursor.getColumnIndex("my_steps"));
                 String f_userid = cursor.getString(cursor.getColumnIndex("f_userid"));
                 String f_name = cursor.getString(cursor.getColumnIndex("f_name"));
-                StepRankingFirstBean entity = new StepRankingFirstBean(date, my_userid, my_rank, my_steps, f_userid, f_name);
+                StepRankingFirstBean entity = new StepRankingFirstBean(id,date, my_userid, my_rank, my_steps, f_userid, f_name);
                 dataList.add(entity);
             }
             stepDb.setTransactionSuccessful();
@@ -116,7 +117,7 @@ public class StepRankingFirstDao {
             values.put("my_steps",bean.getMy_steps());
             values.put("f_userid",bean.getF_userid());
             values.put("f_name",bean.getF_name());
-            stepDb.update("StepRankingFirst", values, "date=?", new String[]{bean.getDate() + ""});
+            stepDb.update("StepRankingFirst", values, "date=?", new String[]{bean.getDate()});
             stepDb.setTransactionSuccessful();
             stepDb.endTransaction();
         } catch (SQLException e) {
@@ -169,12 +170,13 @@ public class StepRankingFirstDao {
             while (cursor.moveToNext()) {
                 String date = curDate;
                 if (curDate.equals(date)) {
+                    int id = cursor.getInt(cursor.getColumnIndex("_id"));
                     String my_userid = cursor.getString(cursor.getColumnIndexOrThrow("my_userid"));
                     String my_rank = cursor.getString(cursor.getColumnIndexOrThrow("my_rank"));
                     String my_steps = cursor.getString(cursor.getColumnIndexOrThrow("my_steps"));
                     String f_userid = cursor.getString(cursor.getColumnIndexOrThrow("f_userid"));
                     String f_name = cursor.getString(cursor.getColumnIndexOrThrow("f_name"));
-                    bean = new StepRankingFirstBean(date, my_userid,my_rank,my_steps,f_userid,f_name);
+                    bean = new StepRankingFirstBean(id,date, my_userid,my_rank,my_steps,f_userid,f_name);
                     //跳出循环
                     break;
                 }

app_core/common/src/main/java/com/core/model/StepRankingFirstBean.java

@@ -14,6 +14,8 @@ public class StepRankingFirstBean {
      + "f_userid TEXT, "
      + "f_name TEXT,"
      */
+
+    private int _id;
     private String date;
     private String my_userid;
     private String my_rank;
@@ -21,7 +23,8 @@ public class StepRankingFirstBean {
     private String f_userid;
     private String f_name;
 
-    public StepRankingFirstBean(String date, String my_userid, String my_rank, String my_steps, String f_userid, String f_name) {
+    public StepRankingFirstBean(int _id,String date, String my_userid, String my_rank, String my_steps, String f_userid, String f_name) {
+        this._id = _id;
         this.date = date;
         this.my_userid = my_userid;
         this.my_rank = my_rank;
@@ -30,6 +33,17 @@ public class StepRankingFirstBean {
         this.f_name = f_name;
     }
 
+    public StepRankingFirstBean(){
+
+    }
+    public int get_id() {
+        return _id;
+    }
+
+    public void set_id(int _id) {
+        this._id = _id;
+    }
+
     public String getDate() {
         return date;
     }

app_core/common/src/main/res/layout/image_setting_activity.xml

@@ -5,8 +5,8 @@
 
     <ImageView
         android:id="@+id/image_im"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
         android:scaleType="fitXY"
         android:src="@drawable/add_picture"
         android:layout_centerInParent="true"
@@ -17,12 +17,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="点击更换照片"
-        android:padding="10dp"
         android:textColor="@color/blue"
-        android:textSize="18sp"
         android:layout_marginBottom="143dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/image_im"
+        android:layout_marginTop="20dp"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -410,7 +410,7 @@ public class StepService extends Service implements SensorEventListener {
         }
 //        StepUtils.doSaveLocalStepsToJudgeHttps();
 //        TrackUtils.doSaveTrackPoint(latLngsList);
-        StepUtils.doBeforeSavaRFIToLocal(my_userid,token); //将每天的第一名信息保存在本地数据库，供第二天展示
+//        StepUtils.doBeforeSavaRFIToLocal(my_userid,token); //将每天的第一名信息保存在本地数据库，供第二天展示
     }
 
     @Override

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepUtils.java

@@ -357,10 +357,26 @@ public class StepUtils {
                         fbean = dao.getCurDataByDate(CURRENT_DATE);
                         LogUtil.prinlnLongMsg("fbean1",JSON.toJSONString(fbean));
                         if (fbean == null){  //进行新增操作
-                            fbean = new StepRankingFirstBean(CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+//                            fbean = new StepRankingFirstBean(null,CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+                            fbean = new StepRankingFirstBean();
+                            fbean.setDate(CURRENT_DATE);
+                            fbean.setMy_userid(my_userid);
+                            fbean.setMy_rank(my_rank);
+                            fbean.setMy_steps(my_steps);
+                            fbean.setF_userid(f_userid);
+                            fbean.setF_name(f_name);
+
                             dao.addNewRFIData(fbean);
                         }else {  //进行更新操作
-                            fbean = new StepRankingFirstBean(CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+//                            fbean = new StepRankingFirstBean(CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+                            fbean = new StepRankingFirstBean();
+                            fbean.setDate(CURRENT_DATE);
+                            fbean.setMy_userid(my_userid);
+                            fbean.setMy_rank(my_rank);
+                            fbean.setMy_steps(my_steps);
+                            fbean.setF_userid(f_userid);
+                            fbean.setF_name(f_name);
+
                             dao.updateCurDateRFI(fbean);
                         }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -29,7 +29,6 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
 
     private String sc_industry = null;
     private String sc_industrycode = null;
-    private String business_iamge;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,14 +61,12 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
             }
         }));
 
-        business_iamge = getIntent().getStringExtra("business_iamge");
     }
 
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.image_setting_rl){
-            startActivity(new Intent(this,ImageSettingActivity.class)
-            .putExtra("business_iamge",business_iamge));
+            startActivity(new Intent(this,ImageSettingActivity.class));
         }else if (v.getId() == R.id.keshi_setting_rl){
             
         }else if (v.getId() == R.id.people_setting_rl){

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -64,7 +64,8 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.image_setting_activity);
         initView();
-		String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        initData();
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
 		for (String permission : permissions) {
 			if (PermissionUtil.lacksPermissions(ct, permission)) {
 				PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
@@ -72,15 +73,42 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
 				return;
 		}
     }
+
+    private void initData() {
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appCompanyAdmin")
+                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("userid", MyApplication.getInstance().getLoginUserId())
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString()+"");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                try {
+                    //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
+                    if (o.toString().contains("result")) {
+                            if (o.toString().contains("url")) {
+                                photoselect = JSON.parseObject(o.toString()).getString("url");
+                                ImageLoader.getInstance().displayImage(photoselect.toString(),mImageIm);
+                            }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+
+    }
+
     private void initView() {
         mImageIm = (ImageView) findViewById(R.id.image_im);
         findViewById(R.id.image_tv).setOnClickListener(this);
         findViewById(R.id.btn_save).setOnClickListener(this);
         mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
         mImageIm.setOnClickListener(this);
-        String business_iamge = getIntent().getStringExtra("business_iamge");
-        if (!StringUtil.isEmpty(business_iamge))
-            ImageLoader.getInstance().displayImage(business_iamge,mImageIm);
     }
 
     @Override

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -103,7 +103,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     private PopupWindow setWindow = null;//
     private RelativeLayout businessmen_setting_rl;
     private TextView bsettingRed;
-    private String business_iamge;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -297,8 +296,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                         }else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                            if (o.toString().contains("url"))
-                                business_iamge = JSON.parseObject(o.toString()).getString("url");
                         }else{
                             businessmen_setting_rl.setVisibility(View.GONE);
                         }
@@ -436,8 +433,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
        }else if (v.getId() == R.id.cancel_tv){
            closePopupWindow();
        }else if (v.getId() == R.id.businessmen_setting_rl){
-           startActivity(new Intent(this,BSettingActivity.class)
-           .putExtra("business_iamge",business_iamge));
+           startActivity(new Intent(this,BSettingActivity.class));
            PreferenceUtils.putBoolean(Constants.B_SETTINGRED, true);
            bsettingRed.setVisibility(View.GONE);
        }

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/UUSportActivity.java

@@ -54,7 +54,8 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
 
     private void initData() {
         model = mStepRankingFirstDao.getAllRFIDatas();
-        LogUtil.prinlnLongMsg("fanglh", JSON.toJSONString(model));
+        StepRankingFirstBean mm = mStepRankingFirstDao.getCurDataByDate("2017年11月06日");
+        LogUtil.prinlnLongMsg("fanglh", JSON.toJSONString(model)+","+JSON.toJSONString(mm));
         if (ListUtils.isEmpty(model)){
             mEmptyLayout.showEmpty();
             return;