316044749 7 роки тому
батько
коміт
7c0cd0937f

+ 0 - 1
app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -286,7 +286,6 @@ public class LoginActivity extends TitleBarActivity {
                             if(isBind){
                                 loginSuccess(loginBean);
                             } else {
-//                                completeUserInfo(thirdId, thirdType, name, iconurl);
                                 thirdRegist(thirdType, thirdId, iconurl, name);
                             }
                         }

+ 3 - 8
app/src/main/java/com/ynstkz/shitu/android/fragment/OrgListFragment.java

@@ -330,11 +330,6 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
                 String content = (String) adapterView.getAdapter().getItem(i);
                 if (filterIndex == 1) {
                     if("附近".equals(content)) {
-//                        if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION)
-//                                == PackageManager.PERMISSION_GRANTED) {
-//                            mlocationClient.startLocation();
-//                            llFilterContent.setVisibility(View.GONE);
-//                        }
                         pageNumber = 1;
                         cityId = parentCityId;
                         getOrgList();
@@ -593,7 +588,7 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
             sortType = "";
             agencyTypeId = "";
             tvFilterOrg.setText("全部");
-            tvFilterOrder.setText("排序");
+            tvFilterOrder.setText("距离");
             getOrgList();
         } else {
             pageNumber = 1;
@@ -611,7 +606,7 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
             sortType = "";
             agencyTypeId = "";
             tvFilterOrg.setText("全部");
-            tvFilterOrder.setText("排序");
+            tvFilterOrder.setText("距离");
             tvFilterLocation.setText(event.getLocationDataBean().getCity());
             if(event.getLocationDataBean().getCityId() != 0) {
                 cityId = event.getLocationDataBean().getCityId();
@@ -670,7 +665,7 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
         this.agencyTypeId = event.getOrgTypeId();
         tvFilterOrg.setText(event.getOrgTypeName());
         sortType = "";
-        tvFilterOrder.setText("排序");
+        tvFilterOrder.setText("距离");
         cityId = event.getCityId();
         parentCityId = event.getCityId();
         tvFilterLocation.setText(event.getCityName());

+ 3 - 1
app/src/main/java/com/ynstkz/shitu/android/fragment/UserCenterFragment.java

@@ -272,7 +272,9 @@ public class UserCenterFragment extends BaseFragment {
     @Override
     public void onResume() {
         super.onResume();
-        getMsgLastTime();
+        if(isLogin()){
+            getMsgLastTime();
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

+ 5 - 3
app/src/main/res/layout/activity_course_detail.xml

@@ -171,7 +171,7 @@
 
             </LinearLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"
@@ -184,7 +184,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:layout_gravity="center_vertical"
+                    android:layout_alignParentTop="true"
                     android:text="报名要求:"
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_15sp" />
@@ -195,10 +195,12 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
+                    android:layout_centerVertical="true"
+                    android:layout_toRightOf="@+id/tv_requirement_lab"
                     android:textColor="@color/color_666"
                     android:textSize="@dimen/company_12sp"/>
 
-            </LinearLayout>
+            </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/tv_registrationt_main"

+ 1 - 1
app/src/main/res/layout/fm_nearby.xml

@@ -103,7 +103,7 @@
                 android:maxLines="1"
                 android:textSize="@dimen/company_16sp"
                 android:textColor="@color/color_666"
-                android:text="排序"/>
+                android:text="距离"/>
 
             <ImageView
                 android:layout_width="wrap_content"

+ 4 - 1
app/src/main/res/layout/item_mine_signup.xml

@@ -64,6 +64,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/company_5dp"
+                    android:maxLines="1"
+                    android:ellipsize="end"
                     android:textSize="@dimen/company_14sp"
                     android:textColor="@color/color_999"/>
 
@@ -77,7 +79,8 @@
                     android:ellipsize="end"
                     android:gravity="right"
                     android:maxLines="1"
-                    android:text="未名湖" />
+                    android:text="未名湖"
+                    android:visibility="gone"/>
 
             </RelativeLayout>
 

+ 5 - 3
app/src/main/res/layout/item_org_course_list.xml

@@ -4,9 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/include_course_line"
-        layout="@layout/view_default_line"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/company_1dp"
+        android:layout_marginLeft="@dimen/company_100dp"
+        android:background="#F5F4F7"/>
 
     <RelativeLayout
         android:layout_width="match_parent"