Commit 8e466b5b by Jinqiu Bai

error happend

parent 2fab7818
......@@ -13,16 +13,16 @@ android {
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
buildTypes {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
buildToolsVersion '28.0.3'
buildToolsVersion '28.0.3'
}
dependencies {
......
......@@ -16,9 +16,12 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".ActivityTest">
<activity android:name=".ActivityTest">
</activity>
<activity
......
......@@ -15,7 +15,7 @@ import net.studymongolian.mongollibrary.MongolTextView;
import java.util.List;
import configs.Configs;
import gsonbeans.Gson_schoolNotifications;
import gsonbeans.Gson_schoolNotifications;
public class AdapterBottom extends RecyclerView.Adapter<AdapterBottom.ViewHolder> {
......
......@@ -14,7 +14,7 @@ import net.studymongolian.mongollibrary.MongolTextView;
import java.util.List;
import configs.Configs;
import configs.Configs;
import gsonbeans.Gson_schoolNews;
public class AdapterTop extends RecyclerView.Adapter<AdapterTop.ViewHolder> {
......
......@@ -9,11 +9,11 @@ import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.google.gson.JsonSyntaxException;
import net.studymongolian.mongollibrary.MongolTextView;
......
......@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.text.Html;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.webkit.WebViewClient;
import android.widget.TextView;
import com.tenny.mystory.TextViewVertical;
......
......@@ -8,9 +8,10 @@ import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
......@@ -191,7 +192,7 @@ public class MainActivity extends AppCompatActivity implements IHandlerListerner
xPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int i, float v, int i1) {
Log.i(TAG, "onPageScrolled: " + i + " " + v + " " + i1);
// Log.i(TAG, "onPageScrolled: " + i + " " + v + " " + i1);
// if (i == 0) {
// xPager.setCurrentItem(7);
// }
......@@ -211,12 +212,12 @@ public class MainActivity extends AppCompatActivity implements IHandlerListerner
@Override
public void onPageSelected(int i) {
Log.i(TAG, "onPageSelected: ");
// Log.i(TAG, "onPageSelected: ");
}
@Override
public void onPageScrollStateChanged(int i) {
Log.i(TAG, "onPageScrollStateChanged: ");
// Log.i(TAG, "onPageScrollStateChanged: ");
}
});
xPager.setScrollDuration(700);
......@@ -227,7 +228,7 @@ public class MainActivity extends AppCompatActivity implements IHandlerListerner
public void run() {
while (true) {
try {
Thread.sleep(5000);
Thread.sleep(10000);
xPager.postDelayed(new Runnable() {
@Override
public void run() {
......@@ -462,4 +463,18 @@ public class MainActivity extends AppCompatActivity implements IHandlerListerner
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == event.KEYCODE_HOME) {
return true;
}
if (keyCode == KeyEvent.KEYCODE_BACK) {
return true;
}
if (keyCode ==KeyEvent.KEYCODE_MENU){
return true;
}
return super.onKeyDown(keyCode, event);
}
}
......@@ -12,7 +12,7 @@ public class Configs {
public static boolean flag_get_news_success;
public static boolean flag_get_notice_success;
public static String api_getNews() {
return "http://zh.pc.api.smart.ordosmz.cn/api/officialnetwork/v1/news/index?school_id=1";
return "http://zh.pc.api.smart.ordosmz.cn/api/officialnetwork/v1/news/index?school_id=1";
}
public static String api_getWeather() {
......
......@@ -7,7 +7,7 @@ public class GsonLeaders {
public Data data;
public class Data {
public LeaderData leaderdata;
public LeaderData leaderdata;
public class LeaderData {
......
......@@ -7,4 +7,4 @@ public class GsonNews {
}
}
......@@ -5,7 +5,7 @@ public class GsonWeather {
public Result result;
public class Result {
public String weather; //天气情况 多云、晴等等
public String weather; //天气情况 多云、晴等等
public String temp; //当前温度
public String temphigh;
public String templow;
......
......@@ -9,7 +9,7 @@ public class Gson_schoolNews { //主页新闻
public String message;
public String code;
@SerializedName("data")
@SerializedName("data")
public DataOut dataOut;
public class DataOut {
......
......@@ -8,7 +8,7 @@ http://zh.pc.api.smart.ordosmz.cn/api/classcard/v1/news/getone/id
public class Gson_schoolNews_content {
public String message;
public String code;
public String code;
public Data data;
......
......@@ -8,7 +8,7 @@ public class Gson_schoolNotification_content {
public Data data;
public class Data{
public String notice_id;
public String notice_id;
public String notice_type;
public String eclass_id;
public String department_id;
......
......@@ -7,7 +7,7 @@ import java.util.List;
public class Gson_schoolNotifications { //主页通知
public String message;
public String code;
public String code;
@SerializedName("data")
public Gson_schoolNotifications.DataOut dataOut;
......
......@@ -6,7 +6,7 @@ public class Gsons {
public static Gson_schoolNews gsonGetSchoolNews;
public static Gson_schoolNotifications gsonGetSchoolNotice;
public static Gson_schoolNotifications gsonGetSchoolNotice;
public static GsonLeaders gsonGetLeaders;
......
......@@ -19,7 +19,7 @@ public class HttpUtils {
public static void getWeather(Callback callback) {
Request request = new Request.Builder()
.url(Configs.api_getWeather())
.url(Configs.api_getWeather())
.build();
client.newCall(request).enqueue(callback);
}
......
......@@ -5,3 +5,4 @@ import android.os.Message;
public interface IHandlerListerner {
void handleMessage(Message msg);
}
\ No newline at end of file
......@@ -22,3 +22,4 @@ public class Myhandler {
mListener = listener;
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ public class TaskRequest extends AsyncTask<Void, Void, Void> {
private static final String TAG = "TaskRequest";
public TaskRequest() {
super();
super();
}
@Override
......
......@@ -15,3 +15,4 @@ public class Utils {
}
\ No newline at end of file
......@@ -19,7 +19,7 @@
<item
android:color="#44000000"
android:offset="0.0" />
<item
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
......
......@@ -5,3 +5,4 @@
android:pathData="M7.75,8.25m-6.75,0a6.75,6.75 0,1 1,13.5 0a6.75,6.75 0,1 1,-13.5 0"
android:strokeColor="#00FFFF" android:strokeWidth="1"/>
</vector>
\ No newline at end of file
......@@ -11,7 +11,7 @@
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
......
......@@ -11,7 +11,7 @@
<path android:fillColor="#001769" android:pathData="M31.454,76.709L44.34,57.618c0.201,0.073,0.399,0.15,0.594,0.231s0.388,0.166,0.576,0.254 c0.189,0.089,0.374,0.182,0.555,0.279c0.181,0.097,0.358,0.199,0.529,0.306l-9.334,20.777 c-0.443,-0.274,-0.898,-0.536,-1.363,-0.787c-0.466,-0.251,-0.943,-0.491,-1.429,-0.72c-0.486,-0.229,-0.981,-0.447,-1.484,-0.655 S31.971,76.897,31.454,76.709"/>
<path android:fillColor="#00186D" android:pathData="M37.261,79.464l9.334,-20.777c0.228,0.141,0.447,0.29,0.656,0.447c0.209,0.157,0.408,0.323,0.596,0.498 c0.188,0.175,0.364,0.358,0.528,0.551c0.164,0.193,0.314,0.395,0.451,0.607l-5.819,24.089c-0.352,-0.546,-0.74,-1.066,-1.161,-1.563 c-0.421,-0.497,-0.876,-0.969,-1.36,-1.419c-0.484,-0.45,-0.997,-0.876,-1.536,-1.282C38.411,80.211,37.847,79.827,37.261,79.464"/>
</group>
<group>
<group>
<clip-path android:pathData="M59.558,84.879L55.253,60.79c0.032,-0.057 0.206,-0.372 0.612,-0.812s1.046,-1.005 2.008,-1.563c0.962,-0.558 2.248,-1.108 3.947,-1.52c1.699,-0.411 3.811,-0.683 6.427,-0.683l24.776,16.878c-6.737,0 -12.177,0.7 -16.552,1.759s-7.685,2.477 -10.164,3.914c-2.478,1.437 -4.125,2.892 -5.172,4.024C60.087,83.921 59.639,84.732 59.558,84.879z M 0,0"/>
<path android:fillColor="#001358" android:pathData="M59.558,84.879L55.253,60.79c0.022,-0.039,0.111,-0.201,0.298,-0.442c0.187,-0.241,0.47,-0.56,0.881,-0.915 c0.41,-0.355,0.947,-0.746,1.641,-1.13c0.693,-0.383,1.543,-0.759,2.579,-1.084l12.809,18.464c-2.667,0.836,-4.855,1.804,-6.641,2.791 c-1.786,0.987,-3.169,1.994,-4.226,2.909c-1.057,0.915,-1.787,1.738,-2.268,2.358C59.844,84.361,59.614,84.777,59.558,84.879"/>
<path android:fillColor="#00145C" android:pathData="M73.459,75.684L60.651,57.22c0.264,-0.083,0.541,-0.162,0.83,-0.238s0.59,-0.147,0.905,-0.214 c0.315,-0.067,0.642,-0.129,0.984,-0.185c0.341,-0.057,0.696,-0.108,1.065,-0.152l18.769,17.22c-0.95,0.116,-1.864,0.247,-2.743,0.393 c-0.879,0.146,-1.723,0.305,-2.533,0.477c-0.81,0.172,-1.587,0.356,-2.331,0.551C74.851,75.265,74.14,75.47,73.459,75.684"/>
......
......@@ -8,7 +8,7 @@
<path android:fillColor="#002093" android:pathData="M208.899,16.917l7.821,0l0,7.281l-7.821,0l0,3.51l-9.432,0l0,-3.51l-26.703,0l0,3.78l-9.441,0l0,-3.78l-7.011,0l0,-7.281l7.011,0l0,-3.771l9.441,0l0,3.771l26.703,0l0,-3.771l9.432,0z"/>
<path android:fillColor="#00155E" android:pathData="M191.376,63.573l-2.973,-12.043l9.736,0l18.311,12.043z"/>
<path android:fillColor="#00155E" android:pathData="M156.582,63.573l18.311,-12.043l9.844,0l-2.802,12.043z"/>
<path android:fillColor="#00155E" android:pathData="M166.563,52.512l12.205,-5.277l14.87,0l11.22,5.277z"/>
<path android:fillColor="#00155E" android:pathData="M166.563,52.512l12.205,-5.277l14.87,0l11.22,5.277z"/>
<group>
<clip-path android:pathData="M204.858,52.512l-11.22,-5.277c0.105,0 0.199,-0.013 0.281,-0.039c0.083,-0.026 0.154,-0.065 0.215,-0.118c0.061,-0.052 0.111,-0.117 0.151,-0.196c0.039,-0.078 0.068,-0.169 0.087,-0.273l12.376,4.291c-0.047,0.268 -0.122,0.502 -0.223,0.704c-0.102,0.201 -0.231,0.369 -0.388,0.504s-0.342,0.235 -0.555,0.303S205.128,52.512 204.858,52.512z M 0,0"/>
<path android:fillColor="#00155F" android:pathData="M204.858,52.512l-11.22,-5.277c0.012,0,0.023,0,0.034,0c0.011,0,0.022,-0.001,0.033,-0.001 s0.022,-0.001,0.033,-0.002c0.011,-0.001,0.021,-0.002,0.032,-0.003l11.428,5.265c-0.027,0.003,-0.054,0.006,-0.082,0.009 c-0.028,0.002,-0.056,0.005,-0.084,0.006c-0.028,0.002,-0.057,0.003,-0.086,0.004S204.888,52.512,204.858,52.512"/>
......
......@@ -8,7 +8,7 @@
<path
android:strokeWidth="1"
android:pathData="M88.571,20.545c0,0,-36.209,-14.547,-48.7,17.393 C9.829,36.515,10.936,60.707,11.252,63.711C6.193,67.19,-9.303,70.984,-11.2,92.33c0.632,8.696,0.949,12.649,2.372,18.183 c1.423,5.534,-1.265,13.124,-5.534,13.756c-4.269,0.632,-6.008,-4.111,-4.111,-7.273c1.739,-3.004,2.214,-2.53,2.214,-2.53 s-5.06,-5.06,-10.119,-0.632c-5.06,4.427,-3.32,14.072,2.056,17.709c5.376,3.637,3.162,2.372,3.162,2.372s-8.696,5.376,-8.696,11.859 c0,6.641,1.897,9.329,7.115,11.226c5.218,1.897,8.064,-4.111,7.906,-5.534c-0.158,-1.423,-2.53,-1.107,-3.795,-2.53 c-1.107,-1.423,-2.056,-5.218,1.581,-6.799c3.637,-1.581,6.957,2.846,7.273,5.06c0.316,2.214,0.474,9.487,-3.162,16.444 s0.474,19.923,2.056,21.978s5.692,11.384,19.29,17.077c-0.158,3.479,-0.791,27.038,26.406,26.88c0.949,0,1.897,-0.474,1.897,-0.474 s5.692,15.654,18.5,20.713c12.807,5.06,23.718,1.423,28.145,0.949c4.427,-0.474,10.436,-0.316,9.803,5.06 c-0.632,5.376,-5.376,3.795,-7.273,2.372c-1.897,-1.423,-2.688,-4.111,-5.06,2.372c1.423,4.427,2.846,7.59,9.013,7.906 c6.167,0.158,10.436,-2.056,11.859,-5.692c0.632,-0.316,6.008,10.91,18.183,6.325c5.692,-3.162,3.953,-9.645,1.581,-10.752 c-1.265,0,-4.269,3.32,-7.431,0.949c-3.162,-2.372,-0.791,-6.641,1.739,-7.748c2.53,-1.107,9.961,-1.581,17.393,1.423 c7.432,3.004,17.551,1.265,21.978,-1.581c5.06,-2.214,16.286,-12.017,17.867,-18.658c13.914,-0.791,19.448,-4.902,21.82,-9.645 c2.372,-4.743,3.795,-9.961,2.372,-16.919c0.632,-0.474,18.974,-6.167,23.876,-21.188c3.32,-12.017,0.158,-26.089,-0.474,-27.196 c-0.632,-1.107,0.791,-9.803,6.008,-8.38c2.53,1.581,2.53,4.585,1.423,7.115c-1.107,2.53,-1.107,3.162,2.688,3.637 c3.795,0.316,9.171,-4.585,8.38,-11.859c-3.004,-6.641,-5.692,-8.38,-6.799,-8.696c-1.107,-0.316,7.432,-4.269,7.115,-10.278 c-0.316,-6.008,-4.744,-9.803,-6.957,-9.329c-2.372,0.474,-4.743,0.474,-5.218,3.32c0.158,1.107,2.846,1.739,2.372,4.427 c-0.474,2.53,-2.214,3.953,-3.795,3.162c-1.581,-0.791,-5.692,-2.688,-4.269,-13.756c1.423,-11.068,2.53,-18.658,-0.632,-25.141 c-3.162,-6.483,-10.91,-15.337,-18.183,-18.342c0,-5.534,1.739,-16.128,-4.111,-21.188c-5.85,-5.06,-10.119,-8.064,-21.504,-7.273 c-0.474,0,0.316,-9.171,-14.072,-18.974c-9.329,-5.376,-23.085,-5.06,-27.512,-4.585c-4.427,0.474,-13.598,2.53,-15.654,-1.107 c-1.739,-2.372,-3.637,-7.431,0.791,-8.064s5.534,1.107,6.008,2.056c0.474,1.107,3.32,0.632,3.479,-2.53s-2.53,-9.645,-9.013,-9.171 c-6.641,0.474,-11.701,3.795,-12.807,9.013c0,-1.739,-3.953,-9.803,-12.966,-10.278S85.093,9.635,86.2,12.481s3.32,3.637,4.427,2.53 c0.949,-1.107,2.372,-5.06,7.115,-2.372s0.949,6.008,0.316,6.483C97.426,18.648,94.106,22.284,88.571,20.545z"
android:strokeAlpha="0.2"
android:strokeAlpha="0.2"
android:fillColor="#00000000"
android:strokeColor="#00FFFF"
android:fillAlpha="0.2"/>
......
......@@ -8,7 +8,7 @@
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"/>
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"/>
......
......@@ -8,7 +8,7 @@
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"/>
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"/>
......
......@@ -6,5 +6,5 @@
<solid android:color="@color/color_attendance_red"/>
<corners android:radius="4dp"/>
</shape>
</shape>
......@@ -7,5 +7,5 @@
android:visible="true"
android:fromDegrees="90"
/>
</item>
</item>
</layer-list>
......@@ -19,7 +19,7 @@
android:id="@+id/iv_logo2"
android:layout_width="679dp"
android:layout_height="118dp"
android:layout_marginLeft="700dp"
android:layout_marginLeft="700dp"
android:layout_marginTop="30dp"
app:srcCompat="@drawable/ic_logo_2" />
......
......@@ -19,7 +19,7 @@
<net.studymongolian.mongollibrary.MongolTextView
android:id="@+id/mtv_title_messages_content"
android:layout_width="wrap_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="18dp"
......
......@@ -19,7 +19,7 @@
<cc.sayaki.widget.PlumbTextView
android:visibility="gone"
android:id="@+id/ptv_test"
android:background="@color/color_text_yellow"
android:background="@color/color_text_yellow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="30dp"
......
......@@ -20,7 +20,7 @@
<net.studymongolian.mongollibrary.MongolTextView
android:id="@+id/mtv_item_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:text="@string/school_news"
app:textColor="@color/color_text_white"
......
......@@ -12,4 +12,4 @@
app:textColor="@color/color_text_white"
app:textSize="30dp" />
</RelativeLayout>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
......@@ -19,7 +19,7 @@
<ImageView
android:src="@drawable/img_corner"
android:layout_width="wrap_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>
......
......@@ -13,7 +13,7 @@
<color name="color_text_white">#ffffff</color>
<!--右侧外框-->
<color name="color_home_right_box">#30c2df</color>
<!--首页考勤蓝-->
<!--首页考勤蓝-->
<color name="color_attendance_blue">#0074a2</color>
<color name="color_attendance_blue_bg">#e5f2fb</color>
<!--首页考勤红-->
......
......@@ -10,7 +10,7 @@
<string name="table_week"> </string>
<string name="class_introduce"></string>
<string name="class_attendance"></string>
<string name="class_table"> </string>
<string name="class_table"> </string>
<string name="class_homework"></string>
<string name="class_demeanor"> </string>
<string name="class_moral"> </string>
......
......@@ -12,7 +12,7 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="windowNoTitle">true</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
</style>
......
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