Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into dev_login

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -64,6 +64,7 @@ import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
+import com.xzjmyk.pm.newpedo.utils.StepCountCheckUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -413,7 +414,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             PushManager.stopWork(this);
         }
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-        if (isUUStep != 0) {
+        if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) {
             startService(new Intent(mContext, com.xzjmyk.pm.newpedo.service.StepService.class));
 //            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 1);
             PreferenceUtils.putInt(MainActivity.UU_STEP, 1);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -117,27 +117,20 @@ public class SplashActivity extends BaseActivity {
             return;
         }
         int userStatus = LoginHelper.prepareUser(mContext);
-        Intent intent = new Intent();
         switch (userStatus) {
             case LoginHelper.STATUS_USER_FULL://5
             case LoginHelper.STATUS_USER_NO_UPDATE://3
-                intent.setClass(mContext, MainActivity.class);
+                trun2NextPage(1);
                 break;
             case LoginHelper.STATUS_USER_TOKEN_OVERDUE://2
             case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:
-                boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
-                if (isFirst) {
-                    intent.setClass(mContext, ADActivity.class);
-                } else
-                    intent.setClass(mContext, LoginActivity.class);
+                trun2NextPage(0);
                 break;
             case LoginHelper.STATUS_NO_USER://0
             default:
                 stay();
                 return;// must return
         }
-        startActivity(intent);
-        finish();
     }
 
     private void jump2() {
@@ -206,11 +199,9 @@ public class SplashActivity extends BaseActivity {
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, password, result);// 设置登陆用户信息
                 }
                 if (success) {// 登陆IM成功
-                    startActivity(new Intent(SplashActivity.this, MainActivity.class));
-                    //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+                    trun2NextPage(1);
                     String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
                     String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
-
                     if (!TextUtils.isEmpty(saved_time)) {
                         PreferenceUtils.putString(TimeStatisticsActivity.Login_In, saved_time + "," + nowtime);
                     } else {
@@ -226,15 +217,27 @@ public class SplashActivity extends BaseActivity {
     }
 
 
+    private void trun2NextPage(int type) {
+        boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
+        Intent intent = new Intent();
+        if (isFirst) {
+            intent.setClass(this, ADActivity.class);
+            intent.putExtra("type", type);
+        } else {
+            if (type == 1) {
+                intent.setClass(this, MainActivity.class);
+            } else {
+                intent.setClass(this, LoginActivity.class);
+            }
+        }
+        startActivity(intent);
+        finish();
+    }
+
     // 停留在此界面
     private void stay() {
         mSelectLv.setVisibility(View.GONE);
-        boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
-        if (isFirst) {
-            startActivity(new Intent(mContext, ADActivity.class));
-            finish();
-        } else
-            startActivity(new Intent(mContext, LoginActivity.class));
+        trun2NextPage(0);
         Animation anim = AnimationUtils.loadAnimation(this, R.anim.alpha_in);
         mSelectLv.startAnimation(anim);
     }

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

@@ -15,6 +15,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.util.LogUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -26,6 +27,7 @@ import com.xzjmyk.pm.activity.util.PreferenceUtils;
 public class ADActivity extends BaseActivity {
     private final String IS_FIRST = "IS_FIRST";
 
+    private int type;
     private final int[] IDS = {R.drawable.index_a, R.drawable.index_b, R.drawable.index_c, R.drawable.index_d};
     @ViewInject(R.id.ad_vp)
     private ViewPager ad_vp;
@@ -45,6 +47,7 @@ public class ADActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_ad);
         ViewUtils.inject(this);
+        type = getIntent().getIntExtra("type", 0);
         getSupportActionBar().hide();
         initView();
 
@@ -110,15 +113,21 @@ public class ADActivity extends BaseActivity {
                         break;
                 }
                 ad_vp.setCurrentItem(item);
-
             }
         });
+    }
 
-
+    @Override
+    public void onBackPressed() {
+        start2Next();
+        super.onBackPressed();
     }
 
     private void start2Next() {
-        startActivity(new Intent(this, LoginActivity.class));
+        if (type == 0)
+            startActivity(new Intent(this, LoginActivity.class));
+        else
+            startActivity(new Intent(this, MainActivity.class));
         PreferenceUtils.putBoolean(IS_FIRST, false);
         finish();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddFlihtsActivity.java

@@ -216,13 +216,13 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
 
     @Override
     public void updateDate(String date,boolean isUpdate) {
-        if (isUpdate) {
-            date_tv.setVisibility(View.GONE);
-            calender_select_ll.setVisibility(View.VISIBLE);
-            click_btn.setText("更新");
-        }else {
+//        if (isUpdate) {
+//            date_tv.setVisibility(View.GONE);
+//            calender_select_ll.setVisibility(View.VISIBLE);
+//            click_btn.setText("更新");
+//        }else {
             date_tv.setText(StringUtils.isEmpty(date) ? "" : date);
-        }
+//        }
     }
 
     @Override
@@ -305,12 +305,12 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             Crouton.showToast(ct, "考勤时间不能为空", R.color.load_warning);
             return false;
         }
-        if (!"更新".equals(click_btn.getText().toString())){
+//        if (!"更新".equals(click_btn.getText().toString())){
             if (StringUtils.isEmpty(date_tv.getText().toString())) {
                 Crouton.showToast(ct, "考勤日期不能为空", R.color.load_warning);
                 return false;
             }
-        }
+//        }
         if (!ListUtils.isEmpty(mans) || !ListUtils.isEmpty(defaultirs)) {
             showDeleteDialog();
             return false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -442,6 +442,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 calendarView = pagerAdapter.getmViews().get(position);
                 setCalenderOnClicklistener();
                 posItem = position;
+                if (day <= 0) return;  // update:2017-4-21-11:06 这里day未获取到闪退了 已做判空处理
                 calendarView.setDownIndex(day);
                 curDate = calendarView.getDownDate();
                 setDateTag(curDate);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatContactAddPeopleActivity.java

@@ -184,8 +184,8 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     }
     private void saveJudge() {
         if (user_name_tv.testValidity() && user_sex_tv.testValidity()
-                && user_department_tv.testValidity() && user_job_tv.testValidity()
-                && user_email_tv.testValidity() && user_tel_tv.testValidity()
+                && user_department_tv.testValidity() && user_job_tv.testValidity() &&
+                user_tel_tv.testValidity()&& user_email_tv.testValidity()
                 ){
 
             if (user_email_tv.getText().toString().contains("@")){

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java

@@ -34,6 +34,8 @@ import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 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.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -137,6 +139,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private int detail_id;
     private int deal_type = -1;
     private Boolean change = false;
+    private DBManager manager = new DBManager(this);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -695,13 +698,40 @@ public class PlatWDdetailyActivity extends BaseActivity {
        try{
            JSONObject object = JSON.parseObject(doc_em_data);
            JSONObject dataObject = object.getJSONObject("data");
-           Long em_code = dataObject.getLongValue("emcode");
+           String em_code = dataObject.getLongValue("emcode")+"";
            String em_name = dataObject.getString("wd_emp");
-
-           name_tv.setText(em_name);
-           String imageUri = "drawable://" + R.drawable.common_header_boy;
-           AvatarHelper.getInstance().display(imageUri, photo_im, true);
-
+           name_tv.setText(em_name+"");
+           if (!StringUtils.isEmpty((em_code))){
+               String whichsys = CommonUtil.getMaster();
+               String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+               String selection = "em_code=? and whichsys=? ";
+               try {
+                   //获取数据库数据
+                   EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                   if (bean != null) {
+                       LogUtil.prinlnLongMsg("bean",JSON.toJSONString(bean));
+                       String imId = String.valueOf(bean.getEm_IMID());
+                       String imName = String.valueOf(bean.getEM_NAME());
+                       String imDepartment = String.valueOf(bean.getEM_DEFAULTORNAME());
+                       String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                       name_tv.setText(imName);
+                       if (!StringUtils.isEmpty(imId)) {
+                           AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                       } else {
+                           String imageUri = "drawable://" + R.drawable.common_header_boy;
+                           AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                       }//显示圆角图片
+                       section_tv.setText(imDepartment + ">" + imPosition);
+
+                       Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                   } else {
+                       ToastMessage("单据申请人数据获取异常");
+                   }
+               } catch (Exception e) {
+                   e.printStackTrace();
+               }
+           }
            Log.i("em_name,em_code",em_name + "," + em_code);
        }catch (Exception e){
            e.printStackTrace();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -123,14 +123,14 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
             iAddFlihtsView.showToast("请填写考勤时间", R.color.load_error);
             return;
         }
-        if (!isUpdate){
+//        if (!isUpdate){
             if (!StringUtils.isEmpty(model.getDay())) {
                 formStore.put("wd_day", model.getDay());
             } else {
                 iAddFlihtsView.showToast("请填写考勤日期", R.color.load_error);
                 return;
             }
-        }
+//        }
 
         //start 人员数据
         EmployeesModel employeesModel = model.getEmployeesModel();

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

@@ -167,7 +167,7 @@ public class Constants {
 
 
     //用于创建Banner表
-    public  static final String CREATE_BANNER = "create table step ("
+    public static final String CREATE_BANNER = "create table step ("
             + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
             + "curDate TEXT, "
             + "totalSteps TEXT)";
@@ -288,11 +288,11 @@ public class Constants {
     public final static int SUCCESS_ERP = 5;//ERP登录成功
     public final static int SUCCESS_INITDATA = 7;
     public final static int FIRST_MSG_REQUEST = 17022801;
-    
+
     //新功能红点
-    public final static String  new_dingyue="dingyue";
-    public final static String  new_signin="signin";
-    public final static String  new_signout="signout";
-    public final static String  new_oa="oa_menu";
-    public final static String  new_business="business";
+    public final static String new_dingyue = "dingyue";
+    public final static String new_signin = "signin";
+    public final static String new_signout = "signout";
+    public final static String new_oa = "oa_menu";
+    public final static String new_business = "business";
 }

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

@@ -113,7 +113,6 @@ public class ViewUtil {
                     }
                     if (!params.containsKey("master")) {
                         params.put("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-
                     }
                     if (!params.containsKey("sessionUser"))
                         params.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -162,7 +162,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 if (isChecked) {
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
-                    Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
+//
                     startActivity(new Intent(mContext, NewStepActivity.class));
                 } else {
                     PushManager.stopWork(MyApplication.getInstance());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -43,6 +43,8 @@ import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -111,6 +113,8 @@ public class FormDetailActivity extends BaseActivity {
     private TextView doc_em_name_tv;
     @ViewInject(R.id.common_docui_photo_img)
     private ImageView photo_im;
+    @ViewInject(R.id.common_docui_Section_tv)
+    private TextView section_tv;
     List<LinkedHashMap<String, String>> datas = new ArrayList<>();
     List<LinkedHashMap<String, String>> details = new ArrayList<>();
     private int mkeyValue = -1;
@@ -138,7 +142,7 @@ public class FormDetailActivity extends BaseActivity {
     private int fpd_id;
     private int wod_id;
     private Boolean change = false;
-
+    private DBManager manager = new DBManager(this);
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -918,7 +922,7 @@ public class FormDetailActivity extends BaseActivity {
 
         }
     }
-
+    private String em_code;
     private void doShowDocEmData(String doc_em_data) {
         JSONObject Object = JSON.parseObject(doc_em_data);
         JSONObject dataObject = Object.getJSONObject("data");
@@ -939,11 +943,44 @@ public class FormDetailActivity extends BaseActivity {
                     wod_id = dataObject.getJSONArray("workovertimedet").getJSONObject(0).getInteger("wod_id");
                     break;
             }
-
+            em_code = dataObject.getLongValue("emcode")+"";
+            getapplypeomsg(em_code);
             doStatusShow(status, doc_em_name);
         }
     }
 
+    private void getapplypeomsg(String em_code) {
+        if (!StringUtils.isEmpty((em_code))){
+            String whichsys = CommonUtil.getMaster();
+            String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+            String selection = "em_code=? and whichsys=? ";
+            try {
+                //获取数据库数据
+                EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                if (bean != null) {
+                    String imId = String.valueOf(bean.getEm_IMID());
+                    String imName = String.valueOf(bean.getEM_NAME());
+                    String imDepartment = String.valueOf(bean.getEM_DEFAULTORNAME());
+                    String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                    if (!StringUtils.isEmpty(imId)) {
+                        AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                    } else {
+                        String imageUri = "drawable://" + R.drawable.common_header_boy;
+                        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                    }//显示圆角图片
+                    section_tv.setText(imDepartment + ">" + imPosition);
+
+                    Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                } else {
+                    ToastMessage("单据申请人数据获取异常");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     private void doShowDocDetails(String com_doc_details) {
         JSONObject Object = JSON.parseObject(com_doc_details);
         JSONObject dataObject = Object.getJSONObject("data");
@@ -1039,6 +1076,9 @@ public class FormDetailActivity extends BaseActivity {
             }
             LogUtil.prinlnLongMsg("doc_key,doc_value,mkeyValue,detail_id", doc_key + "," + doc_value + "," + mkeyValue + "," + detail_id);
             LogUtil.prinlnLongMsg("doc_detail_key,doc_detail_value", doc_detail_key + ":" + doc_detail_value);
+
+            em_code = dataObject.getLongValue("emcode") + "";
+            getapplypeomsg(em_code);
         } else {
             a_and_disa_ll.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -232,8 +232,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         progressDialog.show();
         Map<String, Object> formStoreMap = new HashMap<>();
         formStoreMap.put("taskorschedule", "Task");
-        formStoreMap.put("startdate", et_startime.getText().toString());
-        formStoreMap.put("enddate", et_endtime.getText().toString());
+        formStoreMap.put("startdate", et_startime.getText().toString()+ ":00" );
+        formStoreMap.put("enddate", et_endtime.getText().toString()+ ":00" );
         formStoreMap.put("name", et_title.getText().toString());
         formStoreMap.put("description", et_task_detail.getText().toString());
         formStoreMap.put("resourcename", resourcename);

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -6,9 +6,9 @@ package com.xzjmyk.pm.activity.wxapi;
  * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
-//
-      //private final String mBaseUrl="http://uas.ubtob.com/";
-    private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
+
+      private final String mBaseUrl="http://uas.ubtob.com/";
+//    private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
 //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
 //    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/utils/StepCountCheckUtil.java

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Build;
+import android.util.Log;
 
 /**
  * Created by FANGLH

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

@@ -19,6 +19,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -64,10 +65,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_newstep);
-
         initView();
         initData();
-        initListener();
     }
 
 
@@ -106,6 +105,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 //            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
 //            PushManager.resumeWork(MyApplication.getInstance());
             ToastMessage("小提示:UU在关闭后无法继续统计您的步数数据");
+            Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
+            initListener();
         } else {
             totalStepsTv.setText("0");
             supportTv.setVisibility(View.VISIBLE);

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

@@ -76,6 +76,7 @@ public class NewStepListActivity extends BaseActivity {
             muuStepNumAdapter.setStepEntityList(stepEntityList);
             step_num_lv.setAdapter(muuStepNumAdapter);
         }
+//        stepDataDao.startThread();
     }
     public class UuStepNumAdapter extends BaseAdapter {
         private List<StepEntity> stepEntityList;

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

@@ -174,7 +174,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="该设备不支持计步"
+            android:text="设该备不支持UU计步,抱歉"
             android:textColor="@color/red"/>
 
     </LinearLayout>