Apex Mobile

新版和旧版功能挂接
增加容器类checksavedactivity

Apex Mobile/app/src/main/AndroidManifest.xml

@@ -2,9 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usai.apex"
     android:versionCode="7"
-    android:versionName="A160422" >
-
-    <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
+    android:versionName="A160422"> <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="18" />
@@ -35,7 +33,7 @@
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!--
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -68,8 +66,6 @@
    
     <uses-permission android:name="android.permission.ACCESS_GPS" />
     -->
-
-
     <!--
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.READ_SMS" />
@@ -87,8 +83,6 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     -->
-
-
     <!-- 来电消音 -->
     <!--
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" >
@@ -97,40 +91,39 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     -->
     <application
-        android:name="com.usai.apex.ApexTrackingApplication"
+        android:name=".ApexTrackingApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
 
         <!-- release key -->
-       <!--<meta-data-->
-            <!--android:name="com.google.android.maps.v2.API_KEY"-->
-            <!--android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo" />-->
+        <!-- <meta-data -->
+        <!-- android:name="com.google.android.maps.v2.API_KEY" -->
+        <!-- android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo" /> -->
+
+
+        <!-- <meta-data -->
+        <!-- android:name="com.baidu.lbsapi.API_KEY" -->
+        <!-- android:value="nqBQoSDbxrslhuzW91uViQX7" /> -->
 
-        <!--<meta-data-->
-            <!--android:name="com.baidu.lbsapi.API_KEY"-->
-            <!--android:value="nqBQoSDbxrslhuzW91uViQX7" />-->
-      
-        <!-- debug key -->
 
+        <!-- debug key -->
 
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="AIzaSyD6Snyg2SDUGtkC3sOAr979__IDCZnGGuU" />
         <meta-data
-        android:name="com.baidu.lbsapi.API_KEY"
-        android:value="tznWFxd3RvSoul1TGQp6GSzo" />
-        
-  
+            android:name="com.baidu.lbsapi.API_KEY"
+            android:value="tznWFxd3RvSoul1TGQp6GSzo" />
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
         <activity
-            android:name="com.usai.apex.DetailActivity"
+            android:name=".DetailActivity"
             android:label="@string/title_activity_detail"
-            android:screenOrientation="landscape" >
+            android:screenOrientation="landscape">
 
             <!--
                  <meta-data
@@ -143,16 +136,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             -->
         </activity>
         <activity
-            android:name="com.usai.apex.ApexActivity"
+            android:name=".ApexActivity"
             android:label="@string/title_activity_apex"
             android:logo="@drawable/apexlogo_2"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
+            android:windowSoftInputMode="adjustPan"></activity>
         <!--
              <activity
             android:name="com.usai.apex.LoginFragment"
@@ -163,118 +154,94 @@
             android:name="com.usai.apex.DirectTrackingFragment"
             android:label="@string/title_activity_direct_tracking" >
         </activity>
-
-
-
-
-
-
         -->
 
-
-        <activity android:name=".mainframe.RootActivity"
-
-            >
-
+        <activity android:name=".mainframe.RootActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="com.usai.apex.FunctionSelectActivity"
+            android:name=".FunctionSelectActivity"
             android:label="@string/title_activity_function_select"
             android:launchMode="singleTop"
             android:logo="@drawable/apexlogo_2"
-            android:screenOrientation="portrait" >
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
+            android:screenOrientation="portrait">
+
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
 
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
-            android:name="com.usai.apex.SearchActivity"
+            android:name=".SearchActivity"
             android:label="@string/title_activity_search"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.AnnouncementActivity"
+            android:name=".AnnouncementActivity"
             android:label="@string/title_activity_announcements"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.CustomizeFieldsActivity"
+            android:name=".CustomizeFieldsActivity"
             android:label="@string/title_activity_customize_fields"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.ResultActivity"
-            android:label="@string/title_activity_result" >
-        </activity>
+            android:name=".ResultActivity"
+            android:label="@string/title_activity_result"></activity>
         <activity
-            android:name="com.usai.apex.LocationDetailActivity"
-            android:label="@string/title_activity_location_detail" >
-        </activity>
+            android:name=".LocationDetailActivity"
+            android:label="@string/title_activity_location_detail"></activity>
         <activity
-            android:name="com.usai.apex.InnerMapActivity"
-            android:label="@string/title_activity_inner_map" >
-        </activity>
+            android:name=".InnerMapActivity"
+            android:label="@string/title_activity_inner_map"></activity>
         <activity
-            android:name="com.usai.apex.HelpActivity"
+            android:name=".HelpActivity"
             android:label="@string/title_activity_help"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Holo.NoActionBar" >
-        </activity>
+            android:theme="@android:style/Theme.Holo.NoActionBar"></activity>
         <activity
-            android:name="com.usai.apex.SearchListActivity"
+            android:name=".SearchListActivity"
             android:label="@string/title_activity_search_list"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" >
-        </activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
         <activity
-            android:name="com.usai.apex.RetrievePasswordActivity"
+            android:name=".RetrievePasswordActivity"
             android:label="@string/title_activity_retrieve_password"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.MessageActivity"
+            android:name=".MessageActivity"
             android:label="@string/title_activity_message"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.SearchHistoryActivity"
+            android:name=".SearchHistoryActivity"
             android:label="@string/title_activity_search_history"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.ChangePasswordActivity"
+            android:name=".ChangePasswordActivity"
             android:label="Change Password"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize|stateVisible" >
-        </activity>
+            android:windowSoftInputMode="adjustResize|stateVisible"></activity>
         <activity
-            android:name="com.usai.apex.AboutActivity"
+            android:name=".AboutActivity"
             android:label="@string/title_activity_about"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.WebActivity"
-            android:label="@string/title_activity_web" >
-        </activity>
+            android:name=".WebActivity"
+            android:label="@string/title_activity_web"></activity>
 
         <receiver
-            android:name="com.usai.apex.BootBroadcastReceiver"
-            android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
+            android:name=".BootBroadcastReceiver"
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                
             </intent-filter>
         </receiver>
-        <receiver android:name="com.usai.apex.Alarmreceiver" >
+        <receiver android:name=".Alarmreceiver">
             <intent-filter>
                 <action android:name="com.usai.apex.push" />
                 <action android:name="com.usai.apex.push.cancel" />
@@ -282,39 +249,35 @@
         </receiver>
 
         <activity
-            android:name="com.usai.apex.MessageDetailActivity"
+            android:name=".MessageDetailActivity"
             android:label="@string/title_activity_message_detail"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.InnerToolsActivity"
+            android:name=".InnerToolsActivity"
             android:label="@string/title_activity_inner_tools"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.DocumentsActivity"
+            android:name=".DocumentsActivity"
             android:label="@string/title_activity_documents"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.LocalDocumentActivity"
+            android:name=".LocalDocumentActivity"
             android:label="@string/title_activity_localdocuments"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.ApexHistoryActivity"
+            android:name=".ApexHistoryActivity"
             android:label="@string/title_activity_apexhistory"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name="com.usai.apex.SettingsActivity"
+            android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:screenOrientation="portrait"  >
-        </activity>
-                <service
-            android:name="com.usai.apex.ApexBackgroundService"
-            android:label="Apex Mobile Background Service" >
-        </service>
+            android:screenOrientation="portrait"></activity>
+
+        <service
+            android:name=".ApexBackgroundService"
+            android:label="Apex Mobile Background Service"></service>
+
+        <activity android:name=".saved.CheckSavedActivity"></activity>
     </application>
 
 </manifest>

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/MyFragment.java

@@ -1,16 +1,60 @@
 package com.usai.apex.mainframe;
 
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.View;
+import android.widget.ListView;
 
+import com.usai.apex.ChangePasswordActivity;
+import com.usai.apex.LocalDocumentActivity;
 import com.usai.apex.R;
+import com.usai.apex.saved.CheckSavedActivity;
+
+import org.json.JSONObject;
 
 /**
  * A simple {@link Fragment} subclass.
  */
 public class MyFragment extends StaticModelistFragment {
 
+    static final int PASSWORD_CHANGED = 1;
+    private static final int	REQUEST_CHANGEPASSWORD_ACTIVITY	= 2;
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        switch (requestCode)
+        {
+
+//			case REQUEST_LOGINACTIVITY:
+//				if (resultCode == Activity.RESULT_CANCELED)
+//					getActivity().finish();
+//				break;
+            case REQUEST_CHANGEPASSWORD_ACTIVITY:
+                if (resultCode == Activity.RESULT_OK)
+                {
+//					String UNIQUE_STRING = "com.usai.apex.push.cancel";
+//					Intent intent = new Intent(UNIQUE_STRING);
+//					getActivity().sendBroadcast(intent);
+//					Intent i = new Intent();
+//					i.setClass(getActivity(), ApexActivity.class);
+//					startActivityForResult(i, REQUEST_LOGINACTIVITY);
+                    getActivity().setResult(PASSWORD_CHANGED, null);
+                    getActivity().finish();
+                }
+                break;
+            default:
+                break;
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+
     public interface LogoutCallBack{
         //        public abstract void onLogin();
         public abstract void onLogout();
@@ -43,12 +87,66 @@ public class MyFragment extends StaticModelistFragment {
 //        this.getListView().setBackgroundColor(Color.WHITE);
 
     }
-//
-//    @Override
-//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-//                             Bundle savedInstanceState) {
-//        // Inflate the layout for this fragment
-//        return inflater.inflate(R.layout.fragment_my, container, false);
-//    }
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id)
+    {
+
+        JSONObject jsonobj=loadjson(R.raw.my);
+        Log.d("FragmentList", "Item clicked: " + id);
+
+        String 	title = (String) getData(jsonobj).get(position).get("title");
+
+//        Intent intent = new Intent();
+        if (title.equals("Saved Detail"))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), CheckSavedActivity.class);
+            // intent.putExtra("user", ApexTrackingApplication.get_user());
+            // intent.putExtra("password", password);
+            intent.putExtra("function_name", "Saved Detail");
+//            intent.putExtra("title", "Booking Search");
+            startActivity(intent);
+        }
+        else if (title.equals("Saved Search"))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), CheckSavedActivity.class);
+            // intent.putExtra("user", user);
+            // intent.putExtra("password", password);
+            intent.putExtra("function_name", "Saved Search");
+//            intent.putExtra("title", "B/L info. Search");
+            startActivity(intent);
+        }
+
+        else if(title.equals("Saved Documents"))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), LocalDocumentActivity.class);
+//			intent.putExtra("module_name", "Announcements");
+            startActivity(intent);
+        }
+        else if (title.equals("Change Password"))
+        {
+            Intent intent = new Intent();
+			intent.setClass(getActivity(), ChangePasswordActivity.class);
+
+			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
+			return;
+        }
+        else if (title.equals("Logout"))
+        {
+
+            String UNIQUE_STRING = "com.usai.apex.push.cancel";
+            Intent intent = new Intent(UNIQUE_STRING);
+            // intent.putExtra("key1", "value1");
+            // intent.putExtra("key2", "value2");
+            getActivity().sendBroadcast(intent);
+            if(mCallBack!=null)
+                mCallBack.onLogout();
+
+        }
+
+
+    }
 
 }

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/SearchFragment.java

@@ -1,6 +1,7 @@
 package com.usai.apex.mainframe;
 
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -8,6 +9,9 @@ import android.view.View;
 import android.widget.ListView;
 
 import com.usai.apex.R;
+import com.usai.apex.SearchListActivity;
+
+import org.json.JSONObject;
 
 
 /**
@@ -56,50 +60,72 @@ public class SearchFragment extends StaticModelistFragment {
     @Override
     public void onListItemClick(ListView l, View v, int position, long id)
     {
+
+        JSONObject jsonobj=loadjson(R.raw.search);
         Log.d("FragmentList", "Item clicked: " + id);
 
-//        String title = (String) getData().get(position).get("title");
+        String 	title = (String) getData(jsonobj).get(position).get("title");
+
 //        Intent intent = new Intent();
-//        if (title.equals("Market news"))
-//        {
-//            intent.setClass(getActivity(), AnnouncementActivity.class);
-//            intent.putExtra("module_name", "Market News");
-//        }
-//        else if (title.equals("Announcements"))
-//        {
-//            intent.setClass(getActivity(), AnnouncementActivity.class);
-//            intent.putExtra("module_name", "Announcements");
-//        }
-//        else if (title.equals("About this App"))
-//        {
-//            intent.setClass(getActivity(), AboutActivity.class);
-//        }
-//        else if (title.equals("Saved Detail/Search"))
-//        {
-//            intent.setClass(getActivity(), SearchHistoryActivity.class);
-//        }
-//        else if (title.equals("Change Password"))
-//        {
-//            intent.setClass(getActivity(), ChangePasswordActivity.class);
+        if (title.equals("Ocean Booking"))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), SearchListActivity.class);
+            // intent.putExtra("user", ApexTrackingApplication.get_user());
+            // intent.putExtra("password", password);
+            intent.putExtra("function_name", "Ocean Booking");
+            intent.putExtra("title", "Booking Search");
+            startActivity(intent);
+        }
+        else if (title.equals("Ocean B/L Info."))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), SearchListActivity.class);
+            // intent.putExtra("user", user);
+            // intent.putExtra("password", password);
+            intent.putExtra("function_name", "Ocean B/L info.");
+            intent.putExtra("title", "B/L info. Search");
+            startActivity(intent);
+        }
+
+//		else if (title.equals("Saved Detail/Search"))
+//		{
+//			intent.setClass(getActivity(), SearchHistoryActivity.class);
+//		}
+//		else if (title.equals("Change Password"))
+//		{
+//			intent.setClass(getActivity(), ChangePasswordActivity.class);
 //
-////            startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
-//            return;
-//        }
-//        else if (title.equals("Apex History"))
-//        {
-//            intent.setClass(getActivity(), ApexHistoryActivity.class);
+//			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
+//			return;
+//		}
+        else if (title.equals("Container Detail"))
+        {
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), SearchListActivity.class);
+            // intent.putExtra("user", user);
+            // intent.putExtra("password", password);
+            intent.putExtra("function_name", "Container detail");
+            intent.putExtra("title", "Container Search");
+            startActivity(intent);
+        }
+        else if (title.equals("Document"))
+        {
 //
-////			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
-////			return;
-//        }
-//        else if (title.equals("Setting"))
-//        {
-//            intent.setClass(getActivity(), SettingsActivity.class);
+//            Intent intent = new Intent();
+//            intent.setClass(getActivity(), DocumentsActivity.class);
 //
-////			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
-////			return;
-//        }
-//        startActivity(intent);
+//            startActivity(intent);
+
+
+            Intent intent = new Intent();
+            intent.setClass(getActivity(), SearchListActivity.class);
+
+            intent.putExtra("function_name", "Download Document");
+            intent.putExtra("title", "Document Search");
+            startActivity(intent);
+        }
+
 
     }
 }

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/ToolsFragment.java

@@ -12,21 +12,15 @@ import android.widget.ListView;
 import com.usai.apex.AboutActivity;
 import com.usai.apex.AnnouncementActivity;
 import com.usai.apex.ApexHistoryActivity;
-import com.usai.apex.ChangePasswordActivity;
+import com.usai.apex.InnerMapActivity;
 import com.usai.apex.R;
-import com.usai.apex.SearchHistoryActivity;
-import com.usai.apex.SettingsActivity;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.json.JSONObject;
 
 public class ToolsFragment extends StaticModelistFragment
 {
 
-	static final int PASSWORD_CHANGED = 1;
-	private static final int	REQUEST_CHANGEPASSWORD_ACTIVITY	= 2;
+
 	private static final int	REQUEST_LOGINACTIVITY			= 1;
 
 	private void delShortcut()
@@ -75,34 +69,7 @@ public class ToolsFragment extends StaticModelistFragment
 		getActivity().sendBroadcast(shortcut);
 	}
 
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data)
-	{
-		switch (requestCode)
-		{
 
-//			case REQUEST_LOGINACTIVITY:
-//				if (resultCode == Activity.RESULT_CANCELED)
-//					getActivity().finish();
-//				break;
-			case REQUEST_CHANGEPASSWORD_ACTIVITY:
-				if (resultCode == Activity.RESULT_OK)
-				{
-//					String UNIQUE_STRING = "com.usai.apex.push.cancel";
-//					Intent intent = new Intent(UNIQUE_STRING);
-//					getActivity().sendBroadcast(intent);
-//					Intent i = new Intent();
-//					i.setClass(getActivity(), ApexActivity.class);
-//					startActivityForResult(i, REQUEST_LOGINACTIVITY);
-					getActivity().setResult(PASSWORD_CHANGED, null);
-					getActivity().finish();
-				}
-				break;
-			default:
-				break;
-		}
-		super.onActivityResult(requestCode, resultCode, data);
-	}
 
 	// @Override
 	// public void onActivityResult(int requestCode, int resultCode, Intent
@@ -131,61 +98,61 @@ public class ToolsFragment extends StaticModelistFragment
 	//
 	// super.onActivityResult(requestCode, resultCode, data);
 	// }
-	private List<Map<String, Object>> getData()
-	{
-		boolean login = false;
-		Bundle b = getArguments();
-		
-		if(b!=null)
-		{
-		 login = b.getBoolean("Login");
-		}
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("title", "Market news");
-		map.put("info", "google 1");
-		map.put("img", R.drawable.rect_market_news);
-		list.add(map);
-
-		map = new HashMap<String, Object>();
-		map.put("title", "Announcements");
-		map.put("info", "google 2");
-		map.put("img", R.drawable.rect_announcements);
-		list.add(map);
-
-		if (login)
-		{
-			map = new HashMap<String, Object>();
-			map.put("title", "Saved Detail/Search");
-			map.put("info", "google 2");
-			map.put("img", R.drawable.rect_search_history);
-			list.add(map);
-
-			map = new HashMap<String, Object>();
-			map.put("title", "Change Password");
-			map.put("img", R.drawable.rect_change_password);
-			list.add(map);
-			map = new HashMap<String, Object>();
-			map.put("title", "Setting");
-			map.put("img", R.drawable.rect_setting);
-			list.add(map);
-		}
-		
-		map = new HashMap<String, Object>();
-		map.put("title", "Apex History");
-
-		map.put("img", R.drawable.rect_history);
-		list.add(map);
-		
-		map = new HashMap<String, Object>();
-		map.put("title", "About this App");
-		map.put("info", "google 2");
-		map.put("img", R.drawable.rect_about);
-		list.add(map);
-
-		return list;
-	}
+//	private List<Map<String, Object>> getData()
+//	{
+//		boolean login = false;
+//		Bundle b = getArguments();
+//
+//		if(b!=null)
+//		{
+//		 login = b.getBoolean("Login");
+//		}
+//		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+//
+//		Map<String, Object> map = new HashMap<String, Object>();
+//		map.put("title", "Market news");
+//		map.put("info", "google 1");
+//		map.put("img", R.drawable.rect_market_news);
+//		list.add(map);
+//
+//		map = new HashMap<String, Object>();
+//		map.put("title", "Announcements");
+//		map.put("info", "google 2");
+//		map.put("img", R.drawable.rect_announcements);
+//		list.add(map);
+//
+//		if (login)
+//		{
+//			map = new HashMap<String, Object>();
+//			map.put("title", "Saved Detail/Search");
+//			map.put("info", "google 2");
+//			map.put("img", R.drawable.rect_search_history);
+//			list.add(map);
+//
+//			map = new HashMap<String, Object>();
+//			map.put("title", "Change Password");
+//			map.put("img", R.drawable.rect_change_password);
+//			list.add(map);
+//			map = new HashMap<String, Object>();
+//			map.put("title", "Setting");
+//			map.put("img", R.drawable.rect_setting);
+//			list.add(map);
+//		}
+//
+//		map = new HashMap<String, Object>();
+//		map.put("title", "Apex History");
+//
+//		map.put("img", R.drawable.rect_history);
+//		list.add(map);
+//
+//		map = new HashMap<String, Object>();
+//		map.put("title", "About this App");
+//		map.put("info", "google 2");
+//		map.put("img", R.drawable.rect_about);
+//		list.add(map);
+//
+//		return list;
+//	}
 
 //	@Override
 //	public void onActivityCreated(Bundle savedInstanceState)
@@ -214,50 +181,83 @@ public class ToolsFragment extends StaticModelistFragment
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
+
+		JSONObject jsonobj=loadjson(R.raw.tools);
 		Log.d("FragmentList", "Item clicked: " + id);
 
-		String title = (String) getData().get(position).get("title");
-		Intent intent = new Intent();
-		if (title.equals("Market news"))
+		String 	title = (String) getData(jsonobj).get(position).get("title");
+//		try {
+////			title = jsonobj.getJSONArray("modelist").getJSONObject(position);
+////
+//
+//
+//
+//			} catch (JSONException e) {
+//			e.printStackTrace();
+//		}
+
+		if (title.equals("Market News"))
 		{
+			Intent intent = new Intent();
 			intent.setClass(getActivity(), AnnouncementActivity.class);
 			intent.putExtra("module_name", "Market News");
+			startActivity(intent);
 		}
 		else if (title.equals("Announcements"))
 		{
+			Intent intent = new Intent();
 			intent.setClass(getActivity(), AnnouncementActivity.class);
 			intent.putExtra("module_name", "Announcements");
+			startActivity(intent);
 		}
-		else if (title.equals("About this App"))
-		{
-			intent.setClass(getActivity(), AboutActivity.class);
-		}
-		else if (title.equals("Saved Detail/Search"))
-		{
-			intent.setClass(getActivity(), SearchHistoryActivity.class);
-		}
-		else if (title.equals("Change Password"))
-		{
-			intent.setClass(getActivity(), ChangePasswordActivity.class);
 
-			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
-			return;
-		}
+//		else if (title.equals("Saved Detail/Search"))
+//		{
+//			intent.setClass(getActivity(), SearchHistoryActivity.class);
+//		}
+//		else if (title.equals("Change Password"))
+//		{
+//			intent.setClass(getActivity(), ChangePasswordActivity.class);
+//
+//			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
+//			return;
+//		}
 		else if (title.equals("Apex History"))
 		{
+			Intent intent = new Intent();
 			intent.setClass(getActivity(), ApexHistoryActivity.class);
+			startActivity(intent);
 
 //			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
 //			return;
 		}
-		else if (title.equals("Setting"))
+		else if (title.equals("Service Location"))
 		{
-			intent.setClass(getActivity(), SettingsActivity.class);
+//			intent.setClass(getActivity(), ApexHistoryActivity.class);
+//
+//
+//			Intent intent = new Intent();
+			Intent intent = new Intent();
+			intent.setClass(getActivity(), InnerMapActivity.class);
+			startActivity(intent);
 
 //			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
 //			return;
 		}
-		startActivity(intent);
+		else if (title.equals("About"))
+		{
+			Intent intent = new Intent();
+			intent.setClass(getActivity(), AboutActivity.class);
+			startActivity(intent);
+		}
+//		else if (title.equals("Setting"))
+//		{
+//			intent.setClass(getActivity(), SettingsActivity.class);
+//
+////			startActivityForResult(intent, REQUEST_CHANGEPASSWORD_ACTIVITY);
+////			return;
+//		}
+
 
 	}
 }

Apex Mobile/app/src/main/java/com/usai/apex/saved/CheckSavedActivity.java

@@ -0,0 +1,49 @@
+package com.usai.apex.saved;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+
+import com.usai.apex.FavoritesFragment;
+import com.usai.apex.R;
+import com.usai.apex.SearchHistoryFragment;
+
+public class CheckSavedActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_check_saved);
+
+
+
+        if (savedInstanceState == null)
+        {
+
+
+            String function_name = getIntent().getStringExtra("function_name");
+            if(function_name.equals(getString(R.string.action_saved_search)))
+            {
+                Fragment search = new FavoritesFragment();
+//                ToolsFragment f = new ToolsFragment();
+//                Bundle b = new Bundle();
+//                b.putBoolean("Login", true);
+//                favorites.setArguments(b);
+                getSupportFragmentManager().beginTransaction()
+                        .add(R.id.container, search).commit();
+            }
+            else if (function_name.equals(getString(R.string.action_saved_detail)))
+            {
+                Fragment detail = new SearchHistoryFragment();
+//                Bundle b = new Bundle();
+//                b.putBoolean("Login", true);
+//                history.setArguments(b);
+                getSupportFragmentManager().beginTransaction()
+                        .add(R.id.container, detail).commit();
+            }
+
+
+
+        }
+    }
+}

Apex Mobile/app/src/main/res/layout/activity_check_saved.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.apex.saved.CheckSavedActivity">
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </FrameLayout>
+</android.support.constraint.ConstraintLayout>

RA Image/app/app.iml

@@ -22,25 +22,26 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -55,6 +56,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -78,48 +86,44 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="core-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
-    <orderEntry type="library" exported="" name="httpmime-4.1.1" level="project" />
-    <orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="bcprov-jdk15on-157" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="org.apache.http.legacy-android-25" level="project" />
+    <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RA Image/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RA Image/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
+    <orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RA Image/app/libs/bcprov-jdk15on-157.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" name="org.apache.http.legacy-android-25" level="project" />
   </component>
 </module>

RA Image/app/src/main/java/com/usai/redant/raimage/FullScreenLoginActivity.java

@@ -516,14 +516,14 @@ public class FullScreenLoginActivity extends Activity {
         boolean pop = checkAllPermission();
         if(!pop)
         {
-            if(TextUtils.isEmpty(RedAntApplication.station_name))
+        if(TextUtils.isEmpty(RedAntApplication.station_name))
         {
             Intent intent = new Intent();
             intent.setClass(FullScreenLoginActivity.this,ServerSettingActivity.class);
 //            startActivity(intent);
             startActivityForResult(intent, 0);
         }
-        }
+    }
 
     }
 

RA Image/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 

RA Image/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 02 11:16:48 CST 2017
+#Wed Jan 24 13:52:16 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

RedAnt Mobile/app/app.iml

@@ -115,21 +115,21 @@
     <orderEntry type="library" name="com.android.support:recyclerview-v7-26.0.0-alpha1" level="project" />
     <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/RedAnt Mobile Android/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-v4-26.0.0-alpha1" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/RedAnt Mobile Android/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/macmini1/android project/RedAnt Mobile Android/app/libs/bcprov-jdk15on-157.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-26.0.0-alpha1" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-26.0.0-alpha1" level="project" />
     <orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
     <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RedAnt Mobile/app/libs/bcprov-jdk15on-157.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-vector-drawable-26.0.0-alpha1" level="project" />
     <orderEntry type="library" name="com.android.support:animated-vector-drawable-26.0.0-alpha1" level="project" />
     <orderEntry type="library" name="com.android.support:support-annotations:26.0.0-alpha1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RedAnt Mobile/app/libs/httpmime-4.1.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/ray/Documents/code_ERPSuiteAndroid/RedAnt Mobile/app/libs/core-2.3.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-26.0.0-alpha1" level="project" />

RedAnt Mobile/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
-distributionUrl=http\://127.0.0.1/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+#distributionUrl=http\://127.0.0.1/gradle-4.1-all.zip

RedAnt Mobile/local.properties

@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Dec 11 17:10:58 CST 2017
-sdk.dir=/Users/macmini1/Library/Android/sdk
+#Tue Jan 09 16:30:24 CST 2018
+sdk.dir=/Users/ray/Library/Android/sdk