Browse Source

no message

Fenix Wang 8 years ago
parent
commit
d797a40e40

+ 71 - 40
app/res/layout/mine_fragment.xml

@@ -176,49 +176,65 @@
                     android:background="@color/white"
                     android:clickable="true"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:paddingBottom="8dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="8dp">
 
                     <ImageView
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2"
                         android:src="@drawable/mine_nearby_people" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_weight="7"
+                        android:layout_marginLeft="10dp"
                         android:text="附近的人"
                         android:textStyle="bold" />
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_weight="1"
-                        android:src="@drawable/right_arrow" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="right"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/imageView3"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:src="@drawable/right_arrow" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
 
                 <!--我的便民帖-->
                 <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/grey_light_light"
+                    android:orientation="horizontal">
+
+                </LinearLayout>
+
+                <LinearLayout
                     android:id="@+id/mine_fragment_trade"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
                     android:clickable="true"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:paddingBottom="8dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="8dp">
 
                     <ImageView
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2"
                         android:src="@drawable/mine_trade" />
 
                     <TextView
@@ -227,54 +243,69 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="8dp"
                         android:layout_marginStart="8dp"
-                        android:layout_weight="7"
                         android:text="我的快讯广告"
                         android:textStyle="bold" />
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_weight="1"
-                        android:src="@drawable/right_arrow" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="right|center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/imageView4"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/right_arrow" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
                 <!--设置-->
                 <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/grey_light_light"
+                    android:orientation="horizontal"></LinearLayout>
+
+                <LinearLayout
                     android:id="@+id/mine_fragment_setting"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
                     android:clickable="true"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:paddingBottom="8dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="8dp">
 
                     <ImageView
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2"
                         android:src="@drawable/mine_settings" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_weight="8"
+                        android:layout_marginLeft="10dp"
                         android:text="设置"
                         android:textStyle="bold" />
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_weight="1"
-                        android:src="@drawable/right_arrow" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="right|center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/imageView5"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/right_arrow" />
+                    </LinearLayout>
+
                 </LinearLayout>
             </LinearLayout>
 

+ 4 - 1
app/src/com/sheishuo/app/common/util/net/NetImpl.java

@@ -421,7 +421,10 @@ public class NetImpl implements INet {
                     Response response = client.newCall(request).execute();
                     if (200 == response.code()){
                         String resultStr = response.body().string();
-                        Boolean isUpdate = new JSONObject(resultStr).getJSONObject("d").getBoolean("update");
+                        JSONObject data = new JSONObject(resultStr).getJSONObject("d");
+                        Boolean isUpdate = data.getBoolean("update");
+                        int security = data.has("security") ? data.getInt("security") : 0;
+                        AccountCache.getAccount().setSecurity(security);
                         if (isUpdate){
                             callback.onSuccess(null);
                         }else {

+ 17 - 0
app/src/com/sheishuo/app/core_module/mine/view/ui/activity/SettingsActivity.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.netease.nim.uikit.LoginSyncDataStatusObserver;
 import com.netease.nim.uikit.NimUIKit;
@@ -14,6 +15,7 @@ import com.netease.nim.uikit.common.ui.drop.DropManager;
 import com.netease.nim.uikit.session.activity.WatchPictureActivity;
 import com.sheishuo.app.R;
 import com.sheishuo.app.SheishuoCache;
+import com.sheishuo.app.cache.AccountCache;
 import com.sheishuo.app.chatroom.helper.ChatRoomHelper;
 import com.sheishuo.app.common.util.data.SPHelper;
 import com.sheishuo.app.common.util.net.NetImpl;
@@ -23,6 +25,7 @@ import com.sheishuo.app.impl.SheishuoUIKit;
 import com.sheishuo.app.login.LoginActivity;
 import com.sheishuo.app.login.LoginAndRegActivity;
 import com.sheishuo.app.login.LogoutHelperBak;
+import com.sheishuo.app.login.beans.LoginBean;
 import com.sheishuo.app.login.helper.LoginHelper;
 
 /**
@@ -41,6 +44,7 @@ public class SettingsActivity extends SheishuoUI {
             , feedbackLayout
             , aboutLayout;
 
+    private TextView securityTV;
     private Button quitBtn;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,6 +54,18 @@ public class SettingsActivity extends SheishuoUI {
         init();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        int security = AccountCache.getAccount().getSecurity();
+        if(security == LoginBean.SECURITY_HIGHT)
+            securityTV.setText("安全等级高");
+        else if(security == LoginBean.SECURITY_NORMAL)
+            securityTV.setText("安全等级中等");
+        else
+            securityTV.setText("安全等级低");
+    }
 
     void findViews(){
         toolbar = findView(R.id.toolbar);
@@ -59,6 +75,7 @@ public class SettingsActivity extends SheishuoUI {
         feedbackLayout = findView(R.id.settings_feedback_layout);
         aboutLayout = findView(R.id.settings_about_layout);
         quitBtn = findView(R.id.settings_quit_btn);
+        securityTV = findView(R.id.settings_security_TV);
     }
 
     void init(){

+ 12 - 0
app/src/com/sheishuo/app/login/beans/LoginBean.java

@@ -8,6 +8,9 @@ import java.util.List;
 
 public class LoginBean {
 
+    public final static int SECURITY_LOW = 0;
+    public final static int SECURITY_NORMAL = 1;
+    public final static int SECURITY_HIGHT = 2;
 
     /**
      * c : 0
@@ -69,6 +72,7 @@ public class LoginBean {
         private String district_room_id;
         private List<TradePriorityBean> trade_priority;
         private boolean autoJoinRoom;
+        private int security;
 
         public String getId() {
             return id;
@@ -255,6 +259,14 @@ public class LoginBean {
         {
             this.autoJoinRoom = value;
         }
+
+        public int getSecurity() {
+            return security;
+        }
+
+        public void setSecurity(int security) {
+            this.security = security;
+        }
     }