no message

app/AndroidManifest.xml

@@ -49,7 +49,8 @@
     <application
         android:name="com.sheishuo.app.SheishuoApplication"
         android:allowBackup="true"
-        android:icon="@drawable/ic_logo"
+        android:icon="@drawable/logo"
+        android:roundIcon="@drawable/logo"
         android:label="@string/app_name"
         android:theme="@style/AppTheme.NoActionBar">
 

app/app.iml

@@ -87,6 +87,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

app/proguard.cfg

@@ -140,4 +140,28 @@
 -keep class **.R$* {
  *;
 
-}
+}
+
+
+
+
+
+##---------------Begin: proguard configuration for Gson ----------
+-keep public class com.google.gson.**
+-keep public class com.google.gson.** {public private protected *;}
+
+-keepattributes Signature
+-keepattributes *Annotation*
+
+-keep class com.sheishuo.app.circle.model.beans.**{*;}
+-keep class com.sheishuo.app.login.beans.**{*;}
+-keep class com.sheishuo.app.common.beans.**{*;}
+
+
+
+##---------------End: proguard configuration for Gson ----------
+
+
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+

app/res/layout/about_layout.xml

@@ -45,7 +45,7 @@
         android:layout_above="@id/version_detail_git"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="20dp"
-        android:background="@drawable/about_logo" />
+        android:background="@drawable/logo" />
 
     <TextView
         android:layout_width="wrap_content"

app/res/layout/circle_item.xml

@@ -56,7 +56,7 @@
                         android:id="@+id/user_content_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@android:color/darker_gray"
+                        android:textColor="@android:color/black"
                         android:minHeight="50dp"
                         android:gravity="center_vertical"/>
                 </LinearLayout>
@@ -153,7 +153,7 @@
                     android:padding="3dp"
                     android:layout_marginTop="16dp"
                     android:orientation="horizontal"
-                    android:visibility="gone">
+                    android:visibility="visible">
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -166,6 +166,17 @@
                         android:maxLines="1"
                         android:maxEms="50"/>
                 </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/circle_two_comments_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:background="@color/grey_light_light">
+                    <TextView
+                        android:id="@+id/"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </android.support.v7.widget.CardView>

app/res/layout/login_and_reg_layout.xml

@@ -5,13 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.sheishuo.app.sheishuo.login_and_reg.activity.LoginActivity">
+    tools:context="com.sheishuo.app.login.LoginAndRegActivity">
 
     <ImageView
         android:id="@+id/activity_login_an_reg_logo"
         android:layout_width="100dp"
         android:layout_height="100dp"
-        app:srcCompat="@drawable/about_logo"
+        app:srcCompat="@drawable/logo"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="64dp"
         android:layout_marginLeft="8dp"

app/src/com/sheishuo/app/SheishuoApplication.java

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.sheishuo.app.avchat.AVChatProfile;
+import com.sheishuo.app.common.util.location.LocationHelper;
 import com.sheishuo.app.config.preference.UserPreferences;
 import com.sheishuo.app.main.activity.WelcomeActivity;
 import com.sheishuo.app.avchat.activity.AVChatActivity;
@@ -71,6 +72,15 @@ public class SheishuoApplication extends Application {
         super.onCreate();
 
         context = this;
+        /**
+         * 初始化各种工具
+         */
+        //初始化LocationHelper
+        LocationHelper.init(context);
+
+
+
+
 
         SheishuoCache.setContext(this);
         // 注册小米推送appID 、appKey 以及在云信管理后台添加的小米推送证书名称，该逻辑放在 NIMClient init 之前

app/src/com/sheishuo/app/circle/activity/NewTweetingActivity.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -13,6 +14,7 @@ import com.netease.nimlib.sdk.NIMClient;
 import com.sheishuo.app.AccountCache;
 import com.sheishuo.app.R;
 import com.sheishuo.app.circle.presenter.NewTweetPresenter;
+import com.sheishuo.app.common.util.location.LocationHelper;
 import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.main.activity.MainActivity;
 import com.sheishuo.app.uikit_implements.SheishuoUI;
@@ -84,8 +86,11 @@ public class NewTweetingActivity extends SheishuoUI {
 
 
         //初始化定位
-        locationTV.setText(AccountCache.getAccount().getCity() + AccountCache.getAccount().getDistrict());
+        AccountCache.getAccount().setLatitude(LocationHelper.getLatitude());
+        AccountCache.getAccount().setLongitude(LocationHelper.getLongitude());
 
+        Log.e(TAG,"location ===> " + LocationHelper.getLatitude() + "   " + LocationHelper.getLongitude());
+        locationTV.setText(AccountCache.getAccount().getCity() + AccountCache.getAccount().getDistrict());
 
 
     }

app/src/com/sheishuo/app/common/util/location/LocationHelper.java

@@ -0,0 +1,117 @@
+package com.sheishuo.app.common.util.location;
+
+import android.content.Context;
+import android.content.Intent;
+import android.location.Location;
+import android.location.LocationManager;
+import android.view.View;
+import android.widget.Toast;
+
+import com.netease.nim.uikit.LocationProvider;
+import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
+import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.sheishuo.app.location.activity.LocationAmapActivity;
+import com.sheishuo.app.location.activity.LocationExtras;
+import com.sheishuo.app.location.activity.NavigationAmapActivity;
+import com.sheishuo.app.location.helper.NimLocationManager;
+
+import java.util.List;
+
+/**
+ * Created by KN on 2017/8/21.
+ */
+public class LocationHelper implements LocationProvider {
+    private static LocationManager locationManager;
+    private static String provider;
+    private static Location location;
+
+
+
+
+    public static void init(Context context){
+        initLocation(context);
+    }
+
+    @Override
+    public void requestLocation(final Context context, Callback callback) {
+        if (!NimLocationManager.isLocationEnable(context)) {
+            final EasyAlertDialog alertDialog = new EasyAlertDialog(context);
+            alertDialog.setMessage("位置服务未开启");
+            alertDialog.addNegativeButton("取消", EasyAlertDialog.NO_TEXT_COLOR, EasyAlertDialog.NO_TEXT_SIZE,
+                    new View.OnClickListener() {
+
+                        @Override
+                        public void onClick(View v) {
+                            alertDialog.dismiss();
+                        }
+                    });
+            alertDialog.addPositiveButton("设置", EasyAlertDialog.NO_TEXT_COLOR, EasyAlertDialog.NO_TEXT_SIZE,
+                    new View.OnClickListener() {
+
+                        @Override
+                        public void onClick(View v) {
+                            alertDialog.dismiss();
+                            Intent intent = new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                            try {
+                                context.startActivity(intent);
+                            } catch (Exception e) {
+                                LogUtil.e("LOC", "start ACTION_LOCATION_SOURCE_SETTINGS error");
+                            }
+
+                        }
+                    });
+            alertDialog.show();
+            return;
+        }
+
+        LocationAmapActivity.start(context, callback);
+    }
+
+    @Override
+    public void openMap(Context context, double longitude, double latitude, String address) {
+        Intent intent = new Intent(context, NavigationAmapActivity.class);
+        intent.putExtra(LocationExtras.LONGITUDE, longitude);
+        intent.putExtra(LocationExtras.LATITUDE, latitude);
+        intent.putExtra(LocationExtras.ADDRESS, address);
+        context.startActivity(intent);
+    }
+
+
+
+    private static void initLocation(Context context){
+        //获取定位服务
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        //获取当前可用的位置控制器
+        List<String> list = locationManager.getProviders(true);
+
+        if (list.contains(LocationManager.GPS_PROVIDER)) {
+            //是否为GPS位置控制器
+            provider = LocationManager.GPS_PROVIDER;
+        }
+        else if (list.contains(LocationManager.NETWORK_PROVIDER)) {
+            //是否为网络位置控制器
+            provider = LocationManager.NETWORK_PROVIDER;
+
+        } else {
+            Toast.makeText(context,"请检查网络或GPS是否打开",Toast.LENGTH_LONG).show();
+            return;
+        }
+         location = locationManager.getLastKnownLocation(provider);
+        if (location != null) {
+            //获取当前位置，这里只用到了经纬度
+            String string = "纬度为：" + location.getLatitude() + ",经度为："
+                    + location.getLongitude();
+        }
+    }
+
+    public static String getLatitude(){
+        if (location != null)return String.valueOf(location.getLatitude());
+        return "0.0";
+    }
+
+    public static String getLongitude(){
+        if (location != null)return String.valueOf(location.getLongitude());
+        return "0.0";
+    }
+
+}

app/src/com/sheishuo/app/jsbridge/NotificationHelper.java

@@ -42,7 +42,7 @@ public class NotificationHelper {
             localIntent.setClass(context, MainActivity.class);
             localIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
 
-            int iconId = R.drawable.ic_logo;
+            int iconId = R.drawable.logo;
 
             PendingIntent pendingIntent = PendingIntent.getActivity(context, NOTIFY_ID, localIntent, PendingIntent
                     .FLAG_UPDATE_CURRENT);

app/src/com/sheishuo/app/login/LoginActivity.java

@@ -89,6 +89,8 @@ public class LoginActivity extends SheishuoUI implements View.OnClickListener{
         final String tel = telET.getText().toString().trim();
         final String pwd = pwdET.getText().toString().trim();
 
+        loginBtn.setEnabled(false);
+        loginBtn.setText("登录中...");
 
         net.loginQuery(tel, pwd, new ResponseCallback() {
             @Override
@@ -109,7 +111,8 @@ public class LoginActivity extends SheishuoUI implements View.OnClickListener{
                     @Override
                     public void run() {
                         Toast.makeText(context,"登录失败",Toast.LENGTH_SHORT).show();
-
+                        loginBtn.setEnabled(true);
+                        loginBtn.setText("登录");
                     }
                 });
             }

app/src/com/sheishuo/app/main/adapter/CircleListAdapter.java

@@ -83,7 +83,6 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
         NIMClient.getService(UserService.class).fetchUserInfo(userList).setCallback(new RequestCallback<List<NimUserInfo>>() {
             @Override
             public void onSuccess(List<NimUserInfo> user) {
-
                 holder.usernameTV.setText(getUserName(bean.getUser_id()));
 
             }
@@ -161,6 +160,11 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
 
 
 
+        //加载两条评论
+
+
+
+
     }
 
     @Override
@@ -168,7 +172,6 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
         super.onViewRecycled(holder);
         //解决Glide不能使用添加了Tag的ImageView的问题
         holder.likedImg.setTag(null);
-
         holder.likedUserLayout.setVisibility(View.GONE);
     }
 
@@ -179,7 +182,6 @@ public class CircleListAdapter  extends RecyclerView.Adapter<CircleListAdapter.C
 
 
     //有用户名返回用户名，无用户名返回用户ID
-
     private String getUserName(String userId){
         if (NIMClient.getService(UserService.class).getUserInfo(userId) != null) {
             String name = NIMClient.getService(UserService.class).getUserInfo(userId).getName();

build.gradle

@@ -19,8 +19,8 @@ ext {
     buildToolsVersion = '25.0.3'
     minSdkVersion = 14
     targetSdkVersion = 25
-    versionCode = 36
-    versionName = '4.0.0'
+    versionCode = 1
+    versionName = 'Alpha'
     targetCompatibility = 1.7
     sourceCompatibility = 1.7
 }

uikit/uikit.iml

@@ -59,13 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -73,6 +66,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />