Prechádzať zdrojové kódy

1.修改Android Apex Drivers Detail文字显示不全。

Pen Li 7 rokov pred
rodič
commit
d4298cb282

+ 6 - 6
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/ApexDriverApplication.java

@@ -43,8 +43,8 @@ public class ApexDriverApplication extends Application {
         SharedPreferences.Editor editor = pref.edit();
         try {
 
-            editor.putString("user", AESUtil.encrypt(ApexDriverApplication.secretKey, user));
-            editor.putString("password", AESUtil.encrypt(ApexDriverApplication.secretKey, password));
+            editor.putString("user", encryptString(user));
+            editor.putString("password", encryptString(password));
 
         } catch (Exception e) {
             editor.putString("user", null);
@@ -58,7 +58,7 @@ public class ApexDriverApplication extends Application {
         SharedPreferences pref = getSharedPreferences(ApexDriverApplication.preferencesKey, 0);
         String user = pref.getString("user", null);
         if (user != null) {
-            user = AESUtil.decrypt(ApexDriverApplication.secretKey, user);
+            user = decryptString(user);
         }
         return user;
     }
@@ -67,21 +67,21 @@ public class ApexDriverApplication extends Application {
         SharedPreferences pref = getSharedPreferences(ApexDriverApplication.preferencesKey, 0);
         String p = pref.getString("password", null);
         if (p != null) {
-            p = AESUtil.decrypt(ApexDriverApplication.secretKey, p);
+            p = decryptString(p);
         }
         return p;
     }
 
     public String encryptPassword() {
          if (password != null) {
-             return AESUtil.encrypt(secretKey,password);
+             return encryptString(password);
          }
          return null;
     }
 
     public String encryptUser() {
         if (user != null) {
-            return AESUtil.encrypt(secretKey,user);
+            return encryptString(user);
         }
         return null;
     }

+ 1 - 0
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Home/HomeMoreActivity.java

@@ -322,6 +322,7 @@ public class HomeMoreActivity extends AppCompatActivity implements AbsListView.O
                     }
 
                     activity.mAdapter.notifyDataSetChanged();
+                    activity.footer.setVisibility(View.INVISIBLE);
                 }
                 break;
                 case HomeActionError: {

+ 23 - 23
ApexDrivers/app/src/main/res/layout/detail_location_cell.xml

@@ -14,28 +14,12 @@
         android:text="Pick Up"
         />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/detail_location_title_tv"
-        android:layout_alignLeft="@id/detail_location_title_tv"
-        android:layout_alignRight="@id/detail_location_title_tv"
-        >
-
-        <TextView
-            android:id="@+id/detail_location_value_tv"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginBottom="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
-            android:text="dahkfhdakfgagjdfgajfda\ndagdjfag\n"
-            />
-
         <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/detail_location_title_tv"
+            android:layout_alignLeft="@id/detail_location_title_tv"
+            android:layout_alignRight="@id/detail_location_title_tv"
             >
 
             <Button
@@ -43,15 +27,31 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:layout_marginLeft="5dp"
                 android:textSize="17sp"
                 android:textColor="#44aaff"
                 android:text="Navigation"
                 android:textAllCaps="false"
                 />
 
-        </RelativeLayout>
+            <TextView
+                android:id="@+id/detail_location_value_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@id/detail_location_nav_btn"
+                android:textSize="17sp"
+                android:textColor="#000000"
+                android:text="PORTS AMERICA - OAKLAND (W297)
+1599 MARITIME STREET
+OAKLAND,CA 94607
+TEL:877-900-7264,FAX:
+ATTN:
+EMAIL:"
+                />
 
-    </LinearLayout>
+        </RelativeLayout>
 
 
 </RelativeLayout>