p40918326
/
group_fighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'handsomejun' of https://git.trustie.net/lileilei/group_fighting into handsomejun 

# Conflicts:
#	code/AddressToLatitudeLongitude.java
#	code/MyOriencode\AddressToLatitudeLongitude.java
code\MyOrientationListener.java
tationListener.java
This commit is contained in:
zdj 2018-04-11 23:32:38 +08:00
parent ab958525fb 7f69e754f9
commit 75eb5c1d6e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AddressToLatitudeLongitude.java
View File

@ -47,7 +47,11 @@ public class AddressToLatitudeLongitude {
e.printStackTrace(); e.printStackTrace();
} }
try { try {
<<<<<<< HEAD
// httpsConn = (URLConnection) myURL.openConnection();//建立连接 // httpsConn = (URLConnection) myURL.openConnection();//建立连接
=======
httpsConn = (URLConnection) myURL.openConnection();//建立连接
>>>>>>> 7f69e754f933ab5ea326e502569b912a9177d2ff
if (httpsConn != null) { if (httpsConn != null) {
InputStreamReader insr = new InputStreamReader(//传输数据 InputStreamReader insr = new InputStreamReader(//传输数据
httpsConn.getInputStream(), "UTF-8"); httpsConn.getInputStream(), "UTF-8");

9
code/MyOrientationListener.java
View File

@ -32,12 +32,21 @@ public class MyOrientationListener implements SensorEventListener{
mSensor=mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION); mSensor=mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
} }
//判断是否有方向传感器 //判断是否有方向传感器
<<<<<<< HEAD
// if(mSensor!=null) // if(mSensor!=null)
// { // {
// //注册监听器 // //注册监听器
// mSensorManager.registerListener(this,mSensor,SensorManager.SENSOR_DELAY_UI); // mSensorManager.registerListener(this,mSensor,SensorManager.SENSOR_DELAY_UI);
// } // }
=======
if(mSensor!=null)
{
//注册监听器
mSensorManager.registerListener(this,mSensor,SensorManager.SENSOR_DELAY_UI);
}
>>>>>>> 7f69e754f933ab5ea326e502569b912a9177d2ff
} }