Standardized some class naming -- 规范部分类命名 (resolve: #14188)

Import some icons resource -- 导入部分项目图标 (resolve: #14187)
Change home layout -- 更改首页布局。(resolve: #14184)
Add 30-day statistics display to the home view -- 首页增加30天统计显示(resolve: #14197)
Home view adds welcome display -- 首页增加welcome 显示(resolve: #14196)

ApexDrivers/ratradefiling/src/main/AndroidManifest.xml

@@ -50,7 +50,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".result.ResultActivity"></activity>
-        <activity android:name=".search.SearchListActivity"></activity>
+        <activity android:name=".search.SearchActivity"></activity>
         <activity android:name=".fields.CustomizeFieldsActivity"></activity>
         <activity android:name=".detail.NewDetailActivity"></activity>
     </application>

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/RootActivity.java

@@ -60,7 +60,7 @@ public class RootActivity extends BasicActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         actionbutton = menu;
-        getMenuInflater().inflate(R.menu.quick_search,menu);
+        getMenuInflater().inflate(R.menu.panel_setting,menu);
         return  true;
     }
 
@@ -86,14 +86,15 @@ public class RootActivity extends BasicActivity {
                 }
 
                 break;
-//            case R.id.quick_search:
-//
-//                Intent intent = new Intent();
-//                intent.setClass(RootActivity.this,ContainerSearchActivity.class);
-//            startActivity(intent);
-//
-////                Toast.makeText(this,"跳转至container search activity",Toast.LENGTH_LONG).show();
-//                break;
+            case R.id.quick_search:
+
+            {
+
+                // 设置function panel
+            }
+
+//                Toast.makeText(this,"跳转至container search activity",Toast.LENGTH_LONG).show();
+                break;
 
         }
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/TradeFilingApplication.java

@@ -45,6 +45,10 @@ public class TradeFilingApplication extends Application implements RAProviderHel
 
 	private static String					m_user			= "";
 	private static String					m_password		= "";
+
+	private static String					m_nickname		= "";
+
+	private static boolean					m_active		= false;
 	public static int						ncount			= 1;
 
 	public static boolean					m_bauthorized	= false;
@@ -74,6 +78,14 @@ public class TradeFilingApplication extends Application implements RAProviderHel
 		return this.personMode;
 	}
 
+	public boolean userActive() {
+		return this.m_active;
+	}
+
+	public String getNickname() {
+		return this.m_nickname;
+	}
+
 	public static TradeFilingApplication getInstance() {
 		return instance;
 	}
@@ -163,29 +175,29 @@ public class TradeFilingApplication extends Application implements RAProviderHel
 
 		SharedPreferences pref = TradeFilingApplication.get_instance()
 				.getSharedPreferences("Apex", 0);
-		boolean autologin = pref.getBoolean("autologin", false);
-		if (autologin == true)
-		{
-
-			String u = pref.getString("user", "");
-			String p = pref.getString("password", "");
-//			String s = pref.getString("sessionid", "");
-
-			try
-			{
-				if (!TextUtils.isEmpty(u))
-					m_user = AES.decrypt("apexu", u);
-				if (!TextUtils.isEmpty(p))
-					m_password = AES.decrypt("apexp", p);
-//				if (!TextUtils.isEmpty(s))
-//					m_sessionid = AES.decrypt("apexp", s);
-			}
-			catch (Exception e)
-			{
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
+//		boolean autologin = pref.getBoolean("autologin", false);
+//		if (autologin == true)
+//		{
+//
+//			String u = pref.getString("user", "");
+//			String p = pref.getString("password", "");
+////			String s = pref.getString("sessionid", "");
+//
+//			try
+//			{
+//				if (!TextUtils.isEmpty(u))
+//					m_user = AES.decrypt("apexu", u);
+//				if (!TextUtils.isEmpty(p))
+//					m_password = AES.decrypt("apexp", p);
+////				if (!TextUtils.isEmpty(s))
+////					m_sessionid = AES.decrypt("apexp", s);
+//			}
+//			catch (Exception e)
+//			{
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//		}
 //		dbUtil.cleanhistory();
 
 		// 删除Result固定显示字段 及 更新显示最多三条
@@ -466,6 +478,8 @@ public class TradeFilingApplication extends Application implements RAProviderHel
 		m_user = user;
 		m_password = pass;
 		m_bauthorized = true;
+		m_active = json.optBoolean("active");
+		m_nickname=json.optString("nick_name");
 
 		try {
 			m_function_panel = json.getJSONObject("function_panel");

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/about/AboutFragment.java

@@ -17,7 +17,6 @@ import android.widget.TextView;
 
 import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
-import com.usai.ratradefiling.search.SearchListActivity;
 import com.usai.redant.rautils.WebActivity;
 import com.usai.redant.rautils.utils.RAUtil;
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/HomeFragment.java

@@ -9,6 +9,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -448,6 +449,45 @@ public class HomeFragment extends Fragment
         {
             try
             {
+                JSONObject totaljson=json.getJSONObject("total");
+
+                String headertext = "<center><font size=5 color=white><b>In 30 Days</b>";
+
+                if(totaljson.has("acem1"))
+                {
+
+                    String acem1="  ACE-M1:&nbsp;<font color=yellow>"+ totaljson.optInt("acem1") +"</font>";
+                    headertext=headertext + acem1;
+                }
+                if(totaljson.has("isf"))
+                {
+
+                    String isf="  ISF:&nbsp;<font color=yellow>"+ totaljson.optInt("isf")+"</font>";
+                    headertext=headertext + isf;
+                }
+                if(totaljson.has("aci"))
+                {
+
+                    String aci="  ACI:&nbsp;<font color=yellow>"+totaljson.optInt("aci") +"</font>";
+
+                    headertext=headertext + aci;
+                }
+
+
+                if(totaljson.has("emanifest"))
+                {
+
+                    String eman="  eManifest:&nbsp;<font color=yellow>"+ totaljson.optInt("emanifest") +"</font>";
+                    headertext=headertext + eman;
+                }
+
+
+                headertext=headertext + "</font></center>";
+
+                mHeaderView.setS30(headertext);
+
+
+
                 JSONArray sectionArr = json.optJSONArray("sections");
                 if (sectionArr != null)
                 {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/HomeHeaderView.java

@@ -2,6 +2,7 @@ package com.usai.ratradefiling.home;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,6 +26,7 @@ public class HomeHeaderView extends RelativeLayout {
     GridView function_panel=null;
 
     TextView tv_company;
+    TextView tv_welcome;
     TextView tv_recent;
     public interface HomeHeaderDelegate {
 //        void signoutClick();
@@ -70,9 +72,13 @@ public class HomeHeaderView extends RelativeLayout {
 //    private int newCount,processingCount,finishCount;
 
 
+
+
     public void setS30(String s30)
     {
-        tv_recent.setText(s30);
+
+
+        tv_recent.setText(Html.fromHtml(s30));
     }
     private void init() {
 
@@ -120,6 +126,22 @@ public class HomeHeaderView extends RelativeLayout {
         tv_recent = findViewById(R.id.tv_s30);
 
 
+        tv_welcome = findViewById(R.id.tv_welcome);
+
+        String welcome="";
+
+        if(TradeFilingApplication.get_instance().userActive())
+
+            welcome="Welcome: "+TradeFilingApplication.get_instance().getNickname();
+        else
+            welcome="Inactive User: "+TradeFilingApplication.get_instance().getNickname();
+
+         tv_welcome.setText(welcome);
+
+
+
+
+
 //        newContainer = findViewById(R.id.new_count_container);
 //        processingContainer = findViewById(R.id.processing_count_container);
 //        finishedContainer = findViewById(R.id.finished_count_container);

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/ResultActivity.java

@@ -31,7 +31,7 @@ import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.detail.NewDetailActivity;
 import com.usai.ratradefiling.fields.CustomizeFieldsActivity;
-import com.usai.ratradefiling.search.SearchListActivity;
+import com.usai.ratradefiling.search.SearchActivity;
 import com.usai.redant.rautils.actionsheet.ActionSheet;
 import com.usai.redant.rautils.utils.RAUtil;
 //import com.usai.util.Network;
@@ -348,7 +348,7 @@ public class ResultActivity extends AppCompatActivity implements ResultPresenter
     private void onSearchClick()
     {
         Intent intent = new Intent();
-        intent.setClass(this, SearchListActivity.class);
+        intent.setClass(this, SearchActivity.class);
         // intent.putExtra("user", ApexTrackingApplication.get_user());
         // intent.putExtra("password", password);
         intent.putExtra("sub_type", mParams.getString("sub_type"));

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/search/SearchListActivity.java → ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/search/SearchActivity.java

@@ -5,8 +5,6 @@ import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
@@ -41,11 +39,9 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
-import com.usai.ratradefiling.dataprovider.OnlineDataProvider;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
 import com.usai.ratradefiling.fields.CustomizeFieldsActivity;
 import com.usai.ratradefiling.result.ResultActivity;
-import com.usai.redant.rautils.utils.RAConverter;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -54,11 +50,11 @@ import org.json.JSONObject;
 import java.util.Calendar;
 import java.util.HashMap;
 
-public class SearchListActivity extends AppCompatActivity implements OnClickListener
+public class SearchActivity extends AppCompatActivity implements OnClickListener
 {
 
 
-	public static SearchListActivity instance = null;
+	public static SearchActivity instance = null;
 
 	// String[] spin_valbool = { "True", "False" };
 	LinearLayout			ll_list;
@@ -132,7 +128,7 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
     private EditText mSearchView;
     private Button mTableExpandBtn;
     private boolean mShowTable;
-    private SearchListActivity self = this;
+    private SearchActivity self = this;
     private LinearLayout mSearchToolbar;
 
     @Override
@@ -396,7 +392,7 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
 					{
 						public void onClick(View v)
 						{
-							new DatePickerDialog(SearchListActivity.this,
+							new DatePickerDialog(SearchActivity.this,
 									new DatePickerDialog.OnDateSetListener()
 									{
 
@@ -426,7 +422,7 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
 					{
 						public void onClick(View v)
 						{
-							new DatePickerDialog(SearchListActivity.this,
+							new DatePickerDialog(SearchActivity.this,
 									new DatePickerDialog.OnDateSetListener()
 									{
 
@@ -915,7 +911,7 @@ public class SearchListActivity extends AppCompatActivity implements OnClickList
 			case R.id.btn_clear:
 			{
 				Builder builder = new Builder(
-						SearchListActivity.this);
+						SearchActivity.this);
 				builder.setMessage("Click Reset button to reset");
 
 				builder.setTitle("Confirm reset");

ApexDrivers/ratradefiling/src/main/res/layout/activity_search_list.xml

@@ -3,7 +3,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                tools:context=".search.SearchListActivity">
+                tools:context=".search.SearchActivity">
 
     <LinearLayout
         android:id="@+id/search_tool_bar"

ApexDrivers/ratradefiling/src/main/res/layout/home_header_view1.xml

@@ -25,13 +25,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="5dp"
                 android:text="TextView"
+                android:textColor="#FFFFFF"
                 android:textSize="18sp"
+                app:layout_constraintBottom_toTopOf="@+id/tv_s30"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_welcome" />
+
+            <TextView
+                android:id="@+id/tv_welcome"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="5dp"
+                android:text="TextView"
+                android:textColor="#FFFFFF"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
@@ -41,7 +56,11 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="5dp"
+                android:layout_marginBottom="8dp"
+                android:gravity="center_horizontal"
                 android:text="TextView"
+                android:textColor="#FFFFFF"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_company" />

ApexDrivers/ratradefiling/src/main/res/menu/navi_login.xml

@@ -12,7 +12,7 @@
 
     <item
         android:id="@+id/item_about"
-        android:icon="@drawable/tab_login"
+        android:icon="@drawable/tab_about"
         android:title="About" />
 
 

ApexDrivers/ratradefiling/src/main/res/menu/navi_logout.xml

@@ -6,7 +6,7 @@
         android:title="Login" />
     <item
         android:id="@+id/item_about"
-        android:icon="@drawable/tab_login"
+        android:icon="@drawable/tab_about"
         android:title="About" />
 
 </menu>

ApexDrivers/ratradefiling/src/main/res/menu/panel_setting.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/panel_setting"
+        android:orderInCategory="100"
+        android:icon="@drawable/navi_setting"
+        android:title="Setting"
+        android:visible="true"
+        app:showAsAction="always" />
+
+</menu>