K线图上方的文字说明

RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -29,7 +29,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.181:8080/cfg?key=test_181"//黄老板 华南顺通 调试 110010000001/123123  120010000001/123123
 //    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
 
-    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176"//黄老板 天津麦顿调试
+//    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176"//黄老板 天津麦顿调试
 //    const val baseurl = "http://192.168.31.167:8080/cfg?key=test_167"//黄老板 平安云平台（企业风管）
 
     /**

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/ChartActivity.kt

@@ -36,6 +36,7 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener{
     lateinit var tabLayout: TabLayout
     lateinit var kChartView: KChartView
     lateinit var progressBar: ProgressBar
+    lateinit var chart_title: TextView
 
     companion object {
         // 启动页面
@@ -67,6 +68,8 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener{
         timeChartView =  findViewById(R.id.time_chart_view)  // 分时图
         kChartView = findViewById(R.id.k_chart_view)  //        k线图
         progressBar = findViewById(R.id.progress_view)
+        chart_title = findViewById(R.id.chart_title)
+        kChartView.setUpText(chart_title)
 
         findViewById<RelativeLayout>(R.id.trade_rly).setOnClickListener(this)
 
@@ -177,6 +180,7 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener{
                         timeChartView.visibility = View.VISIBLE
                         viewModel.queryTimeChart()
                         progressBar.visibility = View.VISIBLE
+                        timeChartView.setUpTextInGone(chart_title)
                     }
                     1,2,3,11,12,13,14 -> {
                         kChartView.visibility = View.VISIBLE

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/ChartDataAdapter.kt

@@ -200,7 +200,4 @@ class ChartDataAdapter {
             }
         }
     }
-
-
-
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/old/timeCharts/KChartView.java

@@ -42,6 +42,8 @@ public class KChartView extends FrameLayout {
     MTPTabHost tab;
     TextView info_text;
     String state = ChartConstant.BIAS;
+    TextView upText;
+
     List<HistoryDatas> history = new ArrayList<>();
     public KChartView(@NonNull Context context) {
         super(context);
@@ -55,6 +57,10 @@ public class KChartView extends FrameLayout {
         initView();
     }
 
+    public void setUpText(TextView textView){
+        upText = textView;
+    }
+
     private void initView(){
         view = LayoutInflater.from(getContext()).inflate(R.layout.k_chart_view, this);
         candle_chart = view.findViewById(R.id.candle_chart);
@@ -192,6 +198,10 @@ public class KChartView extends FrameLayout {
         double ma10Val = MA10.getLineData().get(MA10.getLineData().size() - 1);
         double ma15Val = MA15.getLineData().get(MA15.getLineData().size() - 1);
 
+        if(upText != null){
+            StickChartTools.setCandleStickText(context, upText, ma5Val, ma10Val, ma15Val);
+        }
+
         candle_chart.setDecimalNum(new ChartDataAdapter().getGoodsInfoMarket(goodsCode).getGoodsInfo().getDecimalplace());
         candle_chart.invalidate();
         setStickChart();

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/old/timeCharts/StickChartTools.java

@@ -716,4 +716,20 @@ public class StickChartTools {
 
         textView.setText(Html.fromHtml(strHtml));
     }
+
+    public static void setCandleStickText(Context context, TextView candleStickTV,  double ma5Val, double ma10Val, double ma15Val) {
+        String source = "";
+        source += "<font color='" + context.getResources().getColor(com.desfate.chart.R.color.mtp_chart_k_ma5) + "'>MA5:%s </font>";
+        source += "<font color='" + context.getResources().getColor(com.desfate.chart.R.color.mtp_chart_k_ma10) + "'>MA10:%s </font>";
+        source += "<font color='" + context.getResources().getColor(com.desfate.chart.R.color.mtp_chart_k_ma15) + "'>MA15:%s</font>";
+        NumberFormat nf = NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
+        nf.setMaximumFractionDigits(2);
+        nf.setMinimumFractionDigits(2);
+        String ma5 = nf.format(ma5Val);
+        String ma10 = nf.format(ma10Val);
+        String ma15 = nf.format(ma15Val);
+        String strHtml = String.format(source, ma5, ma10, ma15);
+        candleStickTV.setText(Html.fromHtml(strHtml));
+    }
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/old/timeCharts/TimeChartView.java

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 
 import com.desfate.chart.GridChart;
 import com.desfate.chart.LineChart;
@@ -42,6 +43,10 @@ public class TimeChartView extends FrameLayout {
         initView();
     }
 
+    public void setUpTextInGone(TextView textView){
+        textView.setText("");
+    }
+
     public void initView(){
         view =  LayoutInflater.from(getContext()).inflate(R.layout.time_chart_view, this);
         lineChart = view.findViewById(R.id.line_chart_view);

RMA/app/src/main/res/layout/activity_chart.xml

@@ -135,15 +135,15 @@
         app:layout_constraintBottom_toTopOf="@+id/bottom_lay"
         >
 
-    <TextView
-        android:id="@+id/chart_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingBottom="2dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="15dip"
-        android:paddingTop="2dip" />
+        <TextView
+            android:id="@+id/chart_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="10dip"
+            android:paddingTop="2dip"
+            android:paddingRight="15dip"
+            android:paddingBottom="2dip" />
 
     <cn.muchinfo.rma.view.base.chart.old.timeCharts.TimeChartView
         android:id="@+id/time_chart_view"