18:17

WeiChat/src/main/AndroidManifest.xml

@@ -982,6 +982,7 @@
             android:name=".ui.erp.activity.contanct.ContactsActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
+        <activity android:name=".ui.me.TemperatureActivity"></activity>
     </application>
 
 </manifest>

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

@@ -316,7 +316,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         }
         Intent intent = new Intent(ct, SearchLocationActivity.class);
         SearchPoiParam poiParam = new SearchPoiParam();
-        poiParam.setType(1);
+        poiParam.setType(2);
         poiParam.setTitle(MyApplication.getInstance().getResources().getString(R.string.unoffice));
         poiParam.setRadius(300);
         poiParam.setContrastLatLng(new LatLng(companyLocation.getLocation().longitude, companyLocation.getLocation().latitude));

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

@@ -1568,4 +1568,39 @@ public class CommonUtil {
     public static boolean isMainThread() {
         return Looper.getMainLooper().getThread() == Thread.currentThread();
     }
+
+    /**
+     * 将double格式化为指定小数位的String，不足小数位用0补全
+     * @param v  需要格式化的数字
+     * @param scale  小数点后保留几位
+     * @return
+     */
+    public static String roundByScale(double v, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException(
+                    "The   scale   must   be   a   positive   integer   or   zero");
+        }
+        if(scale == 0){
+            return new DecimalFormat("0").format(v);
+        }
+        String formatStr = "0.";
+        for(int i=0;i<scale;i++){
+            formatStr = formatStr + "0";
+        }
+        return new DecimalFormat(formatStr).format(v);
+    }
+
+
+    /**
+     * android 动态设置控件长度宽度
+     * @param view  控件对象
+     * @param width
+     * @param height
+     */
+    public static void setLayoutHandW(View view,int width,int height){
+        LinearLayout.LayoutParams linearParams =(LinearLayout.LayoutParams) view.getLayoutParams();
+        linearParams.width = width;
+        linearParams.height = height;
+        view.setLayoutParams(linearParams);
+    }
 }

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

@@ -35,7 +35,6 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.message.PersonalRegActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -364,7 +363,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             @Override
             public void onClick(View v) {
 //                startActivity(new Intent(ct, PictureSelectorDemo.class));
-                startActivity(new Intent(ct, PersonalRegActivity.class));
+//                startActivity(new Intent(ct, PersonalRegActivity.class));
+                startActivity(new Intent(ct,TemperatureActivity.class));
             }
         });
 

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

@@ -0,0 +1,117 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/8/9.
+ * function:
+ */
+
+public class TemperatureActivity extends BaseActivity {
+    private SensorManager mSensorManager;
+    private Sensor temperature;
+    private Sensor humidity;
+
+    private SensorEventListener tempListener;
+    private SensorEventListener humidityListener;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.temperature_main);
+        onResume();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+      List<Sensor> deviceSensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
+      for (Sensor sensor : deviceSensors) {
+          Log.i("Sensor", "------------------");
+          Log.i("Sensor", sensor.getName());
+          Log.i("Sensor", sensor.getVendor());
+          Log.i("Sensor", Integer.toString(sensor.getType()));
+          Log.i("Sensor", "------------------");
+      }
+        temperature = mSensorManager.getDefaultSensor(Sensor.TYPE_AMBIENT_TEMPERATURE);
+        humidity = mSensorManager.getDefaultSensor(Sensor.TYPE_RELATIVE_HUMIDITY);
+
+        this.tempListener = new TempListener();
+        this.humidityListener = new HumidityListener();
+
+        mSensorManager.registerListener(tempListener, temperature, SensorManager.SENSOR_DELAY_NORMAL);
+        mSensorManager.registerListener(humidityListener, humidity, SensorManager.SENSOR_DELAY_NORMAL);
+    }
+
+/*
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            this.onPause();
+          Log.i("Sensor", "exit");
+            this.finish();
+            System.exit(0);
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+*/
+
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        mSensorManager.unregisterListener(this.tempListener);
+        mSensorManager.unregisterListener(this.humidityListener);
+
+      Log.i("Sensor", "sensor pause");
+    }
+
+    private class TempListener implements SensorEventListener {
+        @Override
+        public final void onSensorChanged(SensorEvent event) {
+            float temperatureValue = event.values[0];    // 利用这些数据执行一些工作
+            BigDecimal bd = new BigDecimal(temperatureValue);
+            double temperature = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//          Log.i("Sensor", "sensor changed==>" + millibars_of_pressure);
+            TextView tem = (TextView)TemperatureActivity.this.findViewById(R.id.temperature);
+            tem.setText(temperature + "℃");
+        }
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+          Log.i("Sensor", "onAccuracyChanged");
+        }
+    }
+
+    private class HumidityListener implements SensorEventListener {
+        @Override
+        public final void onSensorChanged(SensorEvent event) {
+            float humidityValue = event.values[0];    // 利用这些数据执行一些工作
+            BigDecimal bd = new BigDecimal(humidityValue);
+            double humidity = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//          Log.i("Sensor", "sensor changed==>" + millibars_of_pressure);
+            TextView tem = (TextView)TemperatureActivity.this.findViewById(R.id.humidity);
+            tem.setText(humidity + "%");
+        }
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+          Log.i("Sensor", "onAccuracyChanged");
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.xzjmyk.pm.newpedo.utils;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.util.Log;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/8/9.
+ * function:
+ */
+
+public class CommonSensorUtils  {
+
+    private Context context;
+
+    public CommonSensorUtils() {
+
+    }
+
+
+    /**
+     * 获取查看手机上有哪些传感器:
+     * @param context
+     */
+    public static void checkSenior(Context context){
+        //获取传感器管理器
+        SensorManager mSensorManager = (SensorManager) context
+                .getSystemService(context.SENSOR_SERVICE);
+        List<Sensor> deviceSensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
+
+        for (Sensor sensor : deviceSensors) {
+            Log.i("sensor", "------------------");
+            Log.i("sensor", sensor.getName());
+            Log.i("sensor", sensor.getVendor());
+            Log.i("sensor", Integer.toString(sensor.getType()));
+            Log.i("sensor", "------------------");
+        }
+    }
+}

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

@@ -87,11 +87,11 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 
 
     private void initView() {
-        steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
+        steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线效果
         curSelDate = TimeUtil.getCurrentDate();
 //        curSelDate = TimeUtils.s_long_2_str(System.currentTimeMillis());
-        support_step = StepCountCheckUtil.isSupportStepCountSensor(this)
-                ||StepCountCheckUtil.isSupportStepCountSensor();
+        support_step = StepCountCheckUtil.isSupportStepCountSensor(this);
+//                ||StepCountCheckUtil.isSupportStepCountSensor();
         Log.i("support_step",support_step+"");
     }
 
@@ -179,7 +179,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         @Override
         public void onServiceConnected(ComponentName name, final IBinder service) {
             /**
-             * 设置定时器，每个三秒钟去更新一次运动步数
+             * 设置定时器，每隔三秒钟去更新一次运动步数
              */
             timerTask = new TimerTask() {
                 @Override

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

@@ -200,7 +200,6 @@
                 android:background="@drawable/selector_me_menu_item_bg">
 
                 <View
-                    android:id="@+id/view5"
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
@@ -239,7 +238,6 @@
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
                 <View
-                    android:id="@+id/view5"
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+<TextView
+    android:id="@+id/temperature"
+    android:layout_marginTop="100dp"
+    android:layout_gravity="center_horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="18sp"
+    android:text="222"/>
+
+    <TextView
+        android:id="@+id/humidity"
+        android:layout_marginTop="100dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:text="222"/>
+</LinearLayout>

app_core/imageload/build.gradle

@@ -29,6 +29,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     testCompile 'junit:junit:4.12'
 }

app_core/network/build.gradle

@@ -29,6 +29,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     testCompile 'junit:junit:4.12'
 }