Commit 2fab7818 by Jinqiu Bai

finish??????

parent 017a22d5
......@@ -14,11 +14,11 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="height" value="833" />
<entry key="outputName" value="ic_background" />
<entry key="height" value="94" />
<entry key="outputName" value="ic_title_hw_r" />
<entry key="overrideSize" value="true" />
<entry key="sourceFile" value="C:\Users\Administrator\Desktop\智校电子屏元件\背景.svg" />
<entry key="width" value="1417" />
<entry key="sourceFile" value="C:\Users\Administrator\Desktop\智校电子屏元件\title_hw_r.svg" />
<entry key="width" value="93" />
</map>
</option>
</PersistentState>
......
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>
\ No newline at end of file
......@@ -3,6 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RenderSettings">
<option name="showDecorations" value="true" />
</component>
</project>
\ No newline at end of file
......@@ -10,20 +10,19 @@ android {
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
buildToolsVersion '28.0.3'
}
dependencies {
......@@ -41,7 +40,8 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'cn.jzvd:jiaozivideoplayer:6.4.1'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'net.studymongolian:mongol-library:1.17.2'
implementation 'net.studymongolian:mongol-library:1.17.3'
implementation 'cc.sayaki.widget:plumb-textview:1.0.1'
implementation project(':verticaltextviewlibrary')
implementation 'org.jsoup:jsoup:1.11.3'
}
......@@ -6,7 +6,7 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/eclass"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
......@@ -18,12 +18,14 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ActivityTest"></activity>
<activity android:name=".ActivityShowContent"
<activity android:name=".ActivityTest">
</activity>
<activity
android:name=".ActivityShowContent"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="landscape"
android:theme="@style/NewsContentTheme"
></activity>
android:theme="@style/NewsContentTheme"></activity>
</application>
</manifest>
\ No newline at end of file
......@@ -6,12 +6,21 @@ import android.os.Bundle;
import android.text.Html;
import android.util.Log;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import net.studymongolian.mongollibrary.MongolTextView;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import java.io.IOException;
import configs.Configs;
......@@ -26,6 +35,10 @@ public class ActivityShowContent extends AppCompatActivity {
public MongolTextView c_title,
c_message_title, c_message_date, c_message_content;
private LinearLayout ll_mongolian, ll_chinese;
private TextView tv_title, tv_time;
private WebView webView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -41,6 +54,12 @@ public class ActivityShowContent extends AppCompatActivity {
c_message_content = findViewById(R.id.mtv_messages_content);
Configs.setMtvFont_Content(ActivityShowContent.this, c_title,
c_message_title, c_message_date, c_message_content);
ll_mongolian = findViewById(R.id.ll_mongolian);
ll_chinese = findViewById(R.id.ll_chinese);
tv_title = findViewById(R.id.tv_title);
tv_time = findViewById(R.id.tv_time);
webView = findViewById(R.id.webview);
}
public void getMessageContent(String id) {
......@@ -71,15 +90,20 @@ public class ActivityShowContent extends AppCompatActivity {
c_message_title.post(new Runnable() {
@Override
public void run() {
try{
try {
if (!content.data.title_lang.mn.isEmpty()) {
c_message_title.setText(" " + content.data.title_lang.mn);
showView(0);
} else {
c_message_title.setText(" " + content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
showView(1);
}
}catch (NullPointerException e){
} catch (NullPointerException e) {
e.printStackTrace();
c_message_title.setText(" " + content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
showView(1);
}
}
......@@ -87,12 +111,14 @@ public class ActivityShowContent extends AppCompatActivity {
} catch (NullPointerException e) {
e.printStackTrace();
c_message_title.setText(content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
}
try {
c_message_date.post(new Runnable() {
@Override
public void run() {
c_message_date.setText(" " + content.data.created_at);
tv_time.setText(" " + content.data.created_at);
}
});
} catch (NullPointerException e) {
......@@ -108,11 +134,30 @@ public class ActivityShowContent extends AppCompatActivity {
} else {
c_message_content.setText(Html.fromHtml(content.data.content_lang.zh));
}
}catch (NullPointerException e){
} catch (NullPointerException e) {
c_message_content.setText(Html.fromHtml(content.data.content_lang.zh));
}
}
});
try{
webView.post(new Runnable() {
@Override
public void run() {
Document document = Jsoup.parse(content.data.content_lang.zh);
Element e = document.selectFirst("body");
e.attr("style", "color:white;font-size:30px");
webView.loadData(document.toString(), "text/html; charset=UTF-8", "");
webView.setBackgroundColor(Color.parseColor("#00000000"));
Log.d("webview", "run: \n" + document.toString());
}
});
}catch (NullPointerException e){
e.printStackTrace();
}
} catch (NullPointerException e) {
e.printStackTrace();
c_message_content.setText(Html.fromHtml(content.data.content_lang.zh));
......@@ -149,12 +194,17 @@ public class ActivityShowContent extends AppCompatActivity {
try {
if (!content.data.title_lang.mn.isEmpty()) {
c_message_title.setText(" " + content.data.title_lang.mn);
showView(0);
} else {
c_message_title.setText(content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
showView(1);
}
} catch (NullPointerException e) {
e.printStackTrace();
c_message_title.setText(content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
showView(1);
}
}
......@@ -162,12 +212,14 @@ public class ActivityShowContent extends AppCompatActivity {
} catch (NullPointerException e) {
e.printStackTrace();
c_message_title.setText(content.data.title_lang.zh);
tv_title.setText(content.data.title_lang.zh);
}
try {
c_message_date.post(new Runnable() {
@Override
public void run() {
c_message_date.setText(" " + content.data.created_at);
tv_time.setText(" " + content.data.created_at);
}
});
} catch (NullPointerException e) {
......@@ -193,6 +245,23 @@ public class ActivityShowContent extends AppCompatActivity {
e.printStackTrace();
c_message_content.setText(Html.fromHtml(content.data.content_lang.zh));
}
try {
webView.post(new Runnable() {
@Override
public void run() {
Document document = Jsoup.parse(content.data.content_lang.zh);
Element e = document.selectFirst("body");
e.attr("style", "color:white;font-size:30px");
webView.loadData(document.toString(), "text/html; charset=UTF-8", "");
webView.setBackgroundColor(Color.parseColor("#00000000"));
Log.d("webview", "run: \n" + document.toString());
}
});
} catch (NullPointerException e) {
e.printStackTrace();
}
} catch (JsonSyntaxException e) {
e.printStackTrace();
......@@ -257,4 +326,17 @@ public class ActivityShowContent extends AppCompatActivity {
/*************************************************************************/
}
// 0 : mongolia ; 1 : chinese
private void showView(int flag) {
if (flag == 0) {
ll_mongolian.setVisibility(View.VISIBLE);
ll_chinese.setVisibility(View.GONE);
}
if (flag == 1) {
ll_mongolian.setVisibility(View.GONE);
ll_chinese.setVisibility(View.VISIBLE);
}
}
}
......@@ -4,15 +4,22 @@ import android.graphics.Typeface;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.Html;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.TextView;
import com.tenny.mystory.TextViewVertical;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import cc.sayaki.widget.PlumbTextView;
import configs.Configs;
public class ActivityTest extends AppCompatActivity {
private WebView webView;
private WebSettings settings;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -32,6 +39,14 @@ public class ActivityTest extends AppCompatActivity {
// tv.setText(Html.fromHtml("<b><small><font color=#ff0000>" + p + "</b><small/><font/>" +
// "<big>" + time + "</big>"));
webView = findViewById(R.id.webview);
settings = webView.getSettings();
settings.setJavaScriptEnabled(true);
String response = "<p style=\"text-align: center;\"><span style=\"color: #333333; font-family: arial; font-size: 13px;\">&nbsp;</span><span style=\"color: #333333; font-family: arial; font-size: 13px;\">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;</span><img src=\"http://zh.pc.api.smart.ordosmz.cn/storage/Public_Modules/basicmodule/image/2018-06-05/20180605165600-5b165020ccdb4.png\" alt=\"\" width=\"220\" height=\"220\" /></p>\n<p style=\"text-align: center;\"><span style=\"color: #333333; font-family: arial; font-size: 13px;\">&nbsp; &nbsp; &nbsp;年轻的</span><span style=\"color: #333333; font-family: arial; font-size: 13px;\">心属于运动,年轻的心属于追求!湛蓝的天,飘忽的云,我们共同拥有</span><span style=\"color: #333333; font-family: arial; font-size: 13px;\">,热忱的心,微笑的脸,我们共同拥有。</span></p>";
Document document = Jsoup.parse(response);
webView.loadData(response,"text/html;charset=utf-8","");
}
}
......@@ -61,7 +61,8 @@ public class TaskRequest extends AsyncTask<Void, Void, Void> {
if (response.isSuccessful()) {
Gson gson = new Gson();
try {
Gsons.gsonGetWeather = gson.fromJson(response.body().string(), GsonWeather.class);
String a = response.body().string();
Gsons.gsonGetWeather = gson.fromJson(a, GsonWeather.class);
} catch (JsonSyntaxException e) {
e.printStackTrace();
}
......
<vector android:height="94dp" android:viewportHeight="94.37"
android:viewportWidth="92.64" android:width="93dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M0.62,0l0,43.55s0.76,5.16 5.62,6L22.31,49.55v4.44L8.9,53.99S1.38,54.87 0.58,60.6c-0.17,8.63 0,27.87 0,27.87S2.69,93.62 6.24,93.87c4.06,0.08 26.34,0 26.34,0s5.58,-1.23 6.6,-6.13c0,-5.67 0,-16.45 0,-16.45L28.61,71.29v7.74s-0.8,3.13 -3.09,3.38 -11.33,0 -11.33,0a3.4,3.4 0,0 1,-2.54 -2.75c-0.13,-2.54 -0.08,-11.33 -0.08,-11.33s1,-3.3 3.51,-2.79c2.62,-0.25 7.15,-0.13 7.15,-0.13l0.08,8.8A1.35,1.35 0,0 1,21.17 75.87c-1.61,-0.08 -2.58,0 -2.58,0s-1.16,-0.21 -1.06,-1.12 0,-2.56 0,-2.56 0.11,-0.61 0.63,-0.66 3.76,0 3.76,0"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M33.25,71.25L33.25,83.97s-0.62,3.07 -2.82,3.19 -19.85,0 -19.85,0S7.5,86.7 7.17,84.45L7.17,63.87s0.42,-3.16 4.34,-3.5c4.45,-0.28 12.77,-0.2 12.77,-0.2s0,13.33 0,15.36c0.06,1.18 -1.61,2.27 -1.61,2.27s-1.78,0 -4.82,0c-2.2,0.2 -2.23,-1.13 -2.23,-1.13s-0.06,-3.55 0,-5.36a1.47,1.47 0,0 1,1.63 -1.61h5"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M24.45,60.13L33.67,60.13"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M28.57,60.13L28.57,64.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M22.39,49.07L22.39,37.51s-0.42,-2.23 -2.17,-2.28 -2,1 -2,1.8a3.66,3.66 0,0 0,0.79 2.2c0.23,0.11 -1.83,1.61 -2.76,1.21a4.92,4.92 0,0 1,-3.35 -4.31c-0.28,-3 0.87,-3.83 1.63,-4.57a8.81,8.81 0,0 1,7.22 -2.31c4.09,0.42 5.92,3.8 6.51,5.16s0.56,8.26 0.56,8.26L28.82,54.06h-6.4"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M28.79,54.05l4.46,0l0,5.78l0,5.05l-4.68,0l0,5.95"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M28.79,49.18h2.26s2.06,-0.06 2.2,1.55a16.21,16.21 0,0 1,0 2.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M28.79,47.15h3.64s2.18,0.74 2.52,2.24S35.14,64.87 35.14,64.87"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M39.01,64.87L39.01,59.52h3s1.88,0.42 2.18,1.8a26.35,26.35 0,0 1,0.15 3L44.34,88.8s2,4.27 4.59,4.57c5.41,0.05 13.15,0 13.15,0l30.47,0"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M39.01,58.95L39.01,46.24s-1.4,-2.85 -3.49,-3.32a37.13,37.13 0,0 0,-6.73 -0.25"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M39.01,53.26h6.74s3.3,0.89 3.87,3 0.53,8.88 0.53,8.88L50.15,84.4s0.72,2.41 2.26,2.43 11.46,0 11.46,0S66.67,85.69 67.5,83.87A2.62,2.62 0,0 0,66.5 80.56c-0.42,-0.11 -1.16,-0.53 -0.51,-1.67a3.86,3.86 0,0 1,3 -2.09,5.92 5.92,0 0,1 4.78,3.15c1,2 0.15,4.69 0,5.18a4.64,4.64 0,0 1,-1 1.29l15,0h0.57"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M92.64,90.87L49.85,90.87a3.76,3.76 0,0 1,-3 -3.35c0,-4.2 0,-17.2 0,-17.2L46.85,60.49s-0.62,-3.07 -2.23,-3.07L39.39,57.42"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M33.67,64.88L44.32,64.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M39.18,71.25L44.23,71.25"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M28.79,69.31L44.13,69.31"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M35.06,71.87l-0.08,12.88s-0.55,3.38 -3.15,3.85L10.11,88.6s-3.76,0.21 -4.74,-3L5.37,62.87s0.21,-3.38 5.58,-4.53L33.07,58.34"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M22.23,65.37L22.23,60.51"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M63.33,86.87s3.81,0.63 5.62,-1.63 0.8,-4 0.47,-4.48a4.28,4.28 0,0 0,-3.26 -1"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M50.15,64.4L56.7,64.4s5.81,0.37 7.3,6.09 -0.65,7.95 -1.72,9.16 -5.67,2 -6.31,1.58 -3.67,-2.11 -3.1,-5c0.54,-1.83 1.1,-0.87 1.38,-0.9s2,1.1 2.68,0.34 2,-2 1,-3.47a3.61,3.61 0,0 0,-2.57 -1.66c-0.37,0 -4.82,0.11 -4.82,0.11"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M53.77,75.68s0.93,2.65 2.9,2.4a4.69,4.69 0,0 0,3.52 -3.47c0.08,-1 0.23,-3.64 -1.78,-5.07 -2.09,-1 -7.64,-0.59 -7.78,-0.59"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M22.39,47.55L7,47.55A5.4,5.4 0,0 1,2.5 43.15c-0.08,-4.2 -0.08,-18.38 -0.08,-18.38L2.6,1.87"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M22.39,43.23L10.19,43.23a4,4 0,0 1,-3 -3.64c0,-3.19 0.14,-12.57 0.14,-12.57s2,-4.17 5.72,-1.64c0.28,1.38 0.31,3.21 1.63,2.37a4.45,4.45 0,0 0,1.66 -5.69,6.87 6.87,0 0,0 -4.9,-3.58c-0.76,-0.11 -4,0.45 -4.26,1.24s0,-14.35 0,-14.35"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M7.28,27.3S7.5,22.4 11.6,22.57s2.07,3.95 1.8,4.73"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M24.23,53.8L24.23,36.64s-0.68,-3.13 -3.55,-3.55S16.02,35.2 16.05,35.87s0.25,2.42 0.31,2.65a8,8 0,0 0,1.48 1.61"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
</vector>
<vector android:height="94dp" android:viewportHeight="94.37"
android:viewportWidth="92.64" android:width="93dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M92,0l0,43.55s-0.76,5.16 -5.62,6L70.33,49.55v4.44L83.74,53.99s7.53,0.85 8.33,6.55c0.17,8.63 0,27.87 0,27.87S90,93.62 86.4,93.87c-4.06,0.08 -26.34,0 -26.34,0s-5.58,-1.23 -6.6,-6.13c0,-5.67 0,-16.45 0,-16.45L64,71.29v7.74s0.8,3.13 3.09,3.38 11.33,0 11.33,0A3.4,3.4 0,0 0,81 79.63c0.13,-2.54 0.08,-11.33 0.08,-11.33s-1,-3.3 -3.51,-2.79c-2.62,-0.25 -7.15,-0.13 -7.15,-0.13l-0.08,8.8A1.35,1.35 0,0 0,71.48 75.87c1.61,-0.08 2.58,0 2.58,0s1.16,-0.21 1.06,-1.12 0,-2.56 0,-2.56 -0.11,-0.61 -0.63,-0.66 -3.76,0 -3.76,0"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M59.4,71.25L59.4,83.97s0.62,3.07 2.82,3.19 19.85,0 19.85,0 3.13,-0.45 3.41,-2.71L85.48,63.87s-0.42,-3.16 -4.34,-3.5c-4.45,-0.28 -12.77,-0.2 -12.77,-0.2s0,13.33 0,15.36C68.3,76.69 70,77.79 70,77.79s1.78,0 4.82,0c2.2,0.2 2.23,-1.13 2.23,-1.13s0.06,-3.55 0,-5.36a1.47,1.47 0,0 0,-1.63 -1.61h-5"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M68.19,60.13L58.97,60.13"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M64.08,60.13L64.08,64.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M70.25,49.07L70.25,37.51s0.42,-2.23 2.17,-2.28 2,1 2,1.8a3.66,3.66 0,0 1,-0.79 2.2c-0.23,0.11 1.83,1.61 2.76,1.21a4.92,4.92 0,0 0,3.35 -4.31c0.28,-3 -0.87,-3.83 -1.63,-4.57a8.81,8.81 0,0 0,-7.22 -2.31c-4.09,0.42 -5.92,3.8 -6.51,5.16s-0.56,8.26 -0.56,8.26L63.82,54.06h6.4"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M63.85,54.05l-4.45,0l0,5.78l0,5.05l4.68,0l0,5.95"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M63.85,49.18L61.6,49.18s-2.06,-0.06 -2.2,1.55a16.21,16.21 0,0 0,0 2.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M63.85,47.15L60.21,47.15S58,47.87 57.69,49.39 57.5,64.87 57.5,64.87"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M53.63,64.87L53.63,59.52h-3s-1.88,0.42 -2.18,1.8a26.35,26.35 0,0 0,-0.15 3L48.3,88.8s-2,4.27 -4.59,4.57c-5.41,0.05 -13.15,0 -13.15,0l-30.47,0"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M53.63,58.95L53.63,46.24s1.4,-2.85 3.49,-3.32a37.13,37.13 0,0 1,6.73 -0.25"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M53.63,53.26L46.89,53.26s-3.3,0.89 -3.87,3 -0.53,8.88 -0.53,8.88L42.49,84.4s-0.72,2.41 -2.26,2.43 -11.46,0 -11.46,0S26,85.69 25.13,83.87a2.62,2.62 0,0 1,1.06 -3.36c0.42,-0.11 1.16,-0.53 0.51,-1.67a3.86,3.86 0,0 0,-3 -2.09,5.92 5.92,0 0,0 -4.78,3.15c-1,2 -0.15,4.69 0,5.18a4.64,4.64 0,0 0,1 1.29l-15,0L4.35,86.37"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M0,90.87L42.79,90.87a3.76,3.76 0,0 0,3 -3.35c0,-4.2 0,-17.2 0,-17.2L45.79,60.49s0.62,-3.07 2.23,-3.07h5.27"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M58.97,64.88L48.33,64.88"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M53.46,71.25L48.41,71.25"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M63.85,69.31L48.52,69.31"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M57.59,71.87l0.08,12.88s0.55,3.38 3.15,3.85L82.53,88.6s3.76,0.21 4.74,-3L87.27,62.87s-0.21,-3.38 -5.58,-4.53L59.57,58.34"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M70.42,65.37L70.42,60.51"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M29.32,86.87s-3.81,0.63 -5.62,-1.63 -0.8,-4 -0.47,-4.48a4.28,4.28 0,0 1,3.26 -1"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M42.49,64.4L35.94,64.4s-5.81,0.37 -7.3,6.09 0.65,7.95 1.72,9.16 5.67,2 6.31,1.58 3.67,-2.11 3.1,-5c-0.54,-1.83 -1.1,-0.87 -1.38,-0.9s-2,1.1 -2.68,0.34 -2,-2 -1,-3.47a3.61,3.61 0,0 1,2.57 -1.66c0.37,0 4.82,0.11 4.82,0.11"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M38.87,75.68s-0.93,2.65 -2.9,2.4a4.69,4.69 0,0 1,-3.52 -3.47c-0.08,-1 -0.23,-3.64 1.78,-5.07 2.09,-1 7.64,-0.59 7.78,-0.59"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M70.25,47.55L85.64,47.55a5.4,5.4 0,0 0,4.54 -4.4c0.08,-4.2 0.08,-18.38 0.08,-18.38L90,1.87"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M70.25,43.23L82.46,43.23a4,4 0,0 0,3 -3.64c0,-3.19 -0.14,-12.57 -0.14,-12.57s-2,-4.17 -5.72,-1.64c-0.28,1.38 -0.31,3.21 -1.63,2.37a4.45,4.45 0,0 1,-1.66 -5.69,6.87 6.87,0 0,1 4.9,-3.58c0.76,-0.11 4,0.45 4.26,1.24s0,-14.35 0,-14.35"
android:strokeColor="#00bdff" android:strokeWidth="1"/>
<path android:fillColor="#00000000"
android:pathData="M85.36,27.3s-0.26,-4.9 -4.32,-4.73 -2.07,3.95 -1.8,4.73"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
<path android:fillColor="#00000000"
android:pathData="M68.42,53.8L68.42,36.64s0.68,-3.13 3.55,-3.55 4.65,2.11 4.62,2.79 -0.25,2.42 -0.31,2.65a8,8 0,0 1,-1.48 1.61"
android:strokeColor="#00bdff" android:strokeWidth="0.75"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android" >
<size android:height="8dp" android:width="8dp"/>
<solid android:color="@color/color_attendance_red"/>
<corners android:radius="4dp"/>
</shape>
......@@ -11,24 +11,24 @@
android:id="@+id/iv_logo1"
android:layout_width="137dp"
android:layout_height="119dp"
android:layout_marginLeft="88dp"
android:layout_marginLeft="541dp"
android:layout_marginTop="24dp"
app:srcCompat="@drawable/ic_logo_1" />
<ImageView
android:id="@+id/iv_logo2"
android:layout_width="845dp"
android:layout_width="679dp"
android:layout_height="118dp"
android:layout_centerHorizontal="true"
android:layout_marginLeft="700dp"
android:layout_marginTop="30dp"
app:srcCompat="@drawable/ic_logo_2" />
<RelativeLayout
android:id="@+id/ll_left_top"
android:layout_width="444dp"
android:layout_height="561dp"
android:layout_marginLeft="83dp"
android:layout_marginTop="176dp"
android:layout_width="504dp"
android:layout_height="693dp"
android:layout_marginLeft="23dp"
android:layout_marginTop="43dp"
android:background="@color/color_transanction"
android:orientation="horizontal">
......@@ -40,7 +40,7 @@
android:layout_marginTop="27dp"
app:text="@string/school_news"
app:textColor="@color/color_text"
app:textSize="30sp" />
app:textSize="35sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_left_top"
......@@ -55,18 +55,18 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:src="@drawable/img_corner" />
android:src="@drawable/ic_title_hw_l" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_left_bottom"
android:layout_width="444dp"
android:layout_width="504dp"
android:layout_height="291dp"
android:layout_below="@id/ll_left_top"
android:layout_marginLeft="83dp"
android:layout_marginLeft="23dp"
android:layout_marginTop="12dp"
android:background="@color/color_transanction"
android:orientation="horizontal">
......@@ -77,9 +77,9 @@
android:layout_height="wrap_content"
android:layout_marginLeft="32dp"
android:layout_marginTop="27dp"
app:text="@string/big_leader"
app:text="ᠵᠢᠵᠢᠭᠦᠷ ᠤᠳᠤᠷᠢᠳᠤᠯᠭ᠎ᠠ"
app:textColor="@color/color_text"
app:textSize="30sp" />
app:textSize="35sp" />
<HorizontalScrollView
android:layout_width="98dp"
......@@ -113,11 +113,12 @@
android:id="@+id/xbanner_center_top"
android:layout_width="841dp"
android:layout_height="561dp"
app:pointsPosition="RIGHT"
app:pageChangeDuration="500"
app:AutoPlayTime="6000"
android:layout_centerHorizontal="true"
android:layout_marginTop="176dp"></com.stx.xhb.xbanner.XBanner>
android:layout_marginTop="176dp"
app:AutoPlayTime="6000"
app:pageChangeDuration="500"
app:pointSelect="@drawable/selector_point"
app:pointsPosition="RIGHT"></com.stx.xhb.xbanner.XBanner>
<RelativeLayout
android:layout_width="841dp"
......@@ -132,6 +133,7 @@
android:layout_width="238dp"
android:layout_height="268dp"
android:layout_centerVertical="true"
android:layout_marginLeft="-130dp"
android:src="@drawable/ic_sclool_huawen" />
......@@ -140,24 +142,38 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="94dp"
android:layout_marginLeft="28dp"
app:text="@string/big_slogan"
app:textColor="@color/color_text"
app:textSize="30dp" />
app:textSize="35dp" />
<com.stx.xhb.xbanner.XBannerViewPager
android:id="@+id/xbanner_center_bottom"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="50dp"
android:layout_marginTop="38dp"
android:layout_marginRight="50dp"
android:layout_marginBottom="48dp"
android:layout_toRightOf="@+id/mtv_center_bottom_title"></com.stx.xhb.xbanner.XBannerViewPager>
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="80dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="38dp"
android:layout_marginRight="50dp"
android:layout_marginBottom="48dp"
android:layout_toRightOf="@id/iv_center_bottom">
android:layout_toRightOf="@+id/mtv_center_bottom_title"
android:visibility="gone">
<net.studymongolian.mongollibrary.MongolTextView
android:id="@+id/mtv_center_bottom_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
app:gravity="top"
app:text="@string/slogan_0"
app:textColor="@color/color_text_white"
app:textSize="30dp" />
......@@ -167,11 +183,11 @@
<RelativeLayout
android:id="@+id/rl_right_top"
android:layout_width="441dp"
android:layout_height="221dp"
android:layout_width="501dp"
android:layout_height="353dp"
android:layout_alignParentRight="true"
android:layout_marginTop="173dp"
android:layout_marginRight="83dp"
android:layout_marginTop="43dp"
android:layout_marginRight="14dp"
android:background="@color/color_transanction">
<net.studymongolian.mongollibrary.MongolTextView
......@@ -182,18 +198,18 @@
android:layout_marginTop="27dp"
app:text="@string/big_weather"
app:textColor="@color/color_text"
app:textSize="30dp" />
app:textSize="35dp" />
<TextView
android:id="@+id/tv_right_top_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="25dp"
android:layout_marginTop="50dp"
android:layout_toRightOf="@id/mtv_right_top_title"
android:text="2019-1-14 14:56"
android:textColor="@color/color_text_white"
android:textSize="25dp" />
android:textSize="35dp" />
<TextView
android:id="@+id/tv_right_top_temp_current"
......@@ -203,14 +219,13 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@id/mtv_right_top_title"
android:text="-1℃"
android:textColor="@color/color_text_yellow"
android:textSize="35dp" />
android:textSize="45dp" />
<ImageView
android:id="@+id/iv_right_top"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_below="@+id/tv_right_top_time"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
......@@ -225,23 +240,25 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/mtv_right_top_title"
android:text="-10℃~-3℃"
android:textColor="@color/color_text_white"
android:textSize="18dp" />
android:textSize="30dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:src="@drawable/ic_title_hw_r" />
</RelativeLayout>
<RelativeLayout
android:layout_width="441dp"
android:layout_height="625dp"
android:layout_width="501dp"
android:layout_height="629dp"
android:layout_below="@id/rl_right_top"
android:layout_alignParentRight="true"
android:layout_marginTop="12dp"
android:layout_marginRight="83dp"
android:layout_marginRight="19dp"
android:background="@color/color_transanction"
android:orientation="horizontal">
......@@ -253,7 +270,7 @@
android:layout_marginTop="27dp"
app:text="@string/school_notice"
app:textColor="@color/color_text"
app:textSize="30dp" />
app:textSize="35dp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_right_bottom"
......@@ -266,13 +283,6 @@
android:layout_toRightOf="@+id/mtv_right_bottom_title"></android.support.v7.widget.RecyclerView>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:src="@drawable/img_corner" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout 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="1496dp"
android:layout_height="860dp"
android:layout_height="860dp">
<LinearLayout 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:id="@+id/ll_mongolian"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_transanction"
android:orientation="horizontal"
android:visibility="gone"
tools:context=".ActivityShowContent">
<net.studymongolian.mongollibrary.MongolTextView
......@@ -62,5 +71,49 @@
</HorizontalScrollView>
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_chinese"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_transanction"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
android:text="啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
android:textColor="@color/color_text_white"
android:textSize="35dp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="300dp"
android:layout_marginTop="20dp"
android:text="2019-01-21"
android:textColor="@color/color_text_gray"
android:textSize="25dp" />
<View
android:layout_marginTop="20dp"
android:background="@color/color_text"
android:layout_width="match_parent"
android:layout_height="1dp"></View>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent"></WebView>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
</RelativeLayout>
......@@ -9,7 +9,7 @@
android:layout_height="match_parent">
<TextView
android:visibility="gone"
android:id="@+id/tv_test"
android:textSize="35dp"
android:text="1 2 3 4 5 6 7 8 9 10"
......@@ -17,6 +17,7 @@
android:layout_height="wrap_content" />
<cc.sayaki.widget.PlumbTextView
android:visibility="gone"
android:id="@+id/ptv_test"
android:background="@color/color_text_yellow"
android:layout_width="wrap_content"
......@@ -27,6 +28,7 @@
sayaki:textSize="25sp"
/>
<com.tenny.mystory.TextViewVertical
android:visibility="gone"
android:id="@+id/tvv_test"
android:layout_width="wrap_content"
android:layout_height="300dp"
......@@ -38,6 +40,7 @@
</com.tenny.mystory.TextViewVertical>
<net.studymongolian.mongollibrary.MongolTextView
android:visibility="gone"
app:textColor="@color/color_text_white"
app:textSize="35dp"
app:text="   "
......@@ -46,6 +49,7 @@
<RelativeLayout
android:visibility="gone"
android:layout_width="600dp"
android:layout_height="400dp">
......@@ -58,4 +62,9 @@
</RelativeLayout>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<net.studymongolian.mongollibrary.MongolTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
app:gravity="top"
app:textColor="@color/color_text_white"
app:textSize="30dp" />
</RelativeLayout>
\ No newline at end of file
......@@ -24,4 +24,9 @@
</RelativeLayout>
<TextView
android:background="@drawable/selector_point"
android:layout_width="200dp"
android:layout_height="200dp" />
</LinearLayout>
\ No newline at end of file
This image diff could not be displayed because it is too large. You can view the blob instead.
<resources>
<string name="app_name">BigUI</string>
<string name="app_name">鄂尔多斯市蒙古族中学展示厅</string>
<string name="school_news">\u202f  </string>
<string name="school_notice">\u202f </string>
<string name="school_news">   </string>
<string name="school_notice">  </string>
<string name="student_count">  </string>
......@@ -48,19 +48,31 @@
<string name="class_attendance_escape">   </string>
<string name="class_attendance_here">  </string>
<string name="slogan_1">ᠪᠡᠶ᠎ᠡ ᠪᠠᠭᠠᠲᠥᠷ ᠪᠤᠯᠠᠪᠠᠰᠤ ᠨᠢᠭᠡ ᠦᠶ᠎ᠡ ᠵᠢᠨ ᠪᠠᠭᠠᠲᠥᠷ
  ᠪᠢᠯᠢᠭ᠌ ᠪᠠᠭᠠᠲᠥᠷ ᠪᠤᠯᠠᠪᠠᠰᠤ ᠲᠦᠮᠡᠨ ᠦᠶ᠎ᠡ ᠵᠢᠨ ᠪᠠᠭᠠᠲᠥᠷ</string>
<string name="slogan_2">ᠵᠣᠪᠠᠯᠠᠩ ᠦᠭᠡᠢ ᠪᠠᠭᠠᠲᠥᠷ ᠦᠭᠡᠢ
ᠵᠣᠷᠢᠭ ᠦᠭᠡᠢ ᠵᠢᠷᠭᠠᠯ ᠦᠭᠡᠢ</string>
<string name="slogan_3">ᠠᠮᠠᠯᠠᠵᠤ ᠰᠠᠭᠤᠬᠤ ᠪᠠᠷ ᠠᠵᠢᠯᠯᠠᠵᠤ ᠶᠠᠪᠤ
ᠬᠡᠯᠡᠵᠤ ᠰᠠᠭᠤᠬᠤ ᠪᠠᠷ ᠬᠢᠵᠣ ᠶᠠᠪᠤ</string>
<string name="slogan_4">ᠠᠪᠤᠷᠢ ᠦᠭᠡᠢ ᠪᠣᠯ ᠨᠢᠭᠤᠷ ᠵᠢᠡᠨ ᠪᠠᠷᠠᠨ᠎ᠠ
ᠠᠷᠪᠢ ᠦᠭᠡᠢ ᠪᠣᠯ ᠶᠠᠭᠤᠮ᠎ᠠ ᠪᠠᠨ ᠪᠠᠷᠠᠨ᠎ᠠ</string>
<string name="slogan_5">ᠠᠮᠢᠳᠤ ᠬᠦᠮᠦᠨ ᠠᠷᠭ᠎ᠠ ᠲᠠᠢ
ᠠᠷᠭᠠᠯ᠌   ᠤᠨ ᠭᠠᠯ ᠴᠤᠭ ᠲᠠᠢ</string>
<string name="slogan_1">      
        </string>
<string name="slogan_0">      
        </string>
<string name="slogan_2">   
   </string>
<string name="slogan_3">   
   </string>
<string name="slogan_4">     
    </string>
<string name="slogan_5">   
   </string>
<string name="big_slogan"> </string>
<string name="big_weather"> </string>
<string name="big_leader"> </string>
<string name="slogan1">      </string>
<string name="slogan2">       </string>
<string name="slogan3">       </string>
<string name="slogan4">         </string>
<string name="slogan5">   </string>
<string name="slogan6">     </string>
<string name="slogan7">       </string>
<string name="slogan8">     </string>
<string name="big_slogan">ᠮᠡᠷᠭᠡᠨ ᠦᠭᠡᠰ</string>
<string name="big_weather">ᠴᠠᠭ ᠠᠭᠤᠷ</string>
<string name="big_leader">ᠵᠢᠵᠢᠭᠦᠷ ᠡᠷᠬᠢᠯᠡᠭᠴᠢ</string>
</resources>
......@@ -11,7 +11,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.4.0'
// NOTE: Do not place your application dependencies here; they belong
......
#Thu May 16 10:42:01 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
......@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
minSdkVersion 16
......@@ -22,10 +21,10 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:24.2.1'
testImplementation 'junit:junit:4.12'
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment