this.update(完善user属性,baidu定位,整体布局)

ahaochina · Apr 9, 2016 · ffbe29c · ffbe29c
1 parent 3305cca
commit ffbe29c
Show file tree

Hide file tree

Showing 37 changed files with 1,818 additions and 316 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -83,6 +83,7 @@
     <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="bugly_crash_release__2.0" level="project" />
     <orderEntry type="library" exported="" name="baidumapapi_base_v3_7_3" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appindexing-8.1.0" level="project" />
     <orderEntry type="library" exported="" name="commons-codec-1.6" level="project" />
     <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="baidumapapi_radar_v3_7_3" level="project" />
@@ -97,6 +98,7 @@
     <orderEntry type="library" exported="" name="httpclient-4.3.5" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="httpclient-4.3.6" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-8.1.0" level="project" />
     <orderEntry type="library" exported="" name="butterknife-5.1.1" level="project" />
     <orderEntry type="library" exported="" name="baidumapapi_cloud_v3_7_3" level="project" />
     <orderEntry type="library" exported="" name="juhe_sdk_v_2_7" level="project" />

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
         android:name=".App"
         android:allowBackup="true"
         android:hardwareAccelerated="false"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/run"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
 
@@ -47,7 +47,9 @@
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="3a0vVIWyrZC2CQSdrvvObnM7123OugOG" />
         <!-- 主界面 -->
+        <activity android:name=".EditProfile"/>
         <activity
+
             android:name=".MainActivity"
             android:label="@string/app_name">
 
@@ -56,12 +58,21 @@
             <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
             <!-- </intent-filter> -->
         </activity>
+        <activity android:name=".Farest"/>
+        <activity android:name=".RunnerWorld"/>
+
+
+        <activity android:name=".FriendStatusActivity"/>
+        <activity android:name=".main"/>
+        <activity android:name=".Myrun"/>
+
 
         <!-- 添加好友 -->
         <activity android:name=".AddFriendActivity" />
         <!-- 好友列表 -->
         <activity android:name=".FriendListActivity" />
         <!-- 对话 -->
+        <activity android:name=".Register1" />
         <activity android:name=".ConversationAcivity">
             <intent-filter>
 

diff --git a/app/src/main/java/com/hechao/chat/App.java b/app/src/main/java/com/hechao/chat/App.java
@@ -15,6 +15,7 @@ public class App extends Application {
     public static String token = null;
     public static String username = null;
     public static boolean isLogin = false;
+    public static String ip="10.176.172.177";
 
     @Override
     public void onCreate() {