diff --git a/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_bottom.xml b/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_bottom.xml index 229e640..43b798d 100644 --- a/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_bottom.xml +++ b/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_bottom.xml @@ -32,7 +32,7 @@ xmlns:mv="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/ll_tap" + android:layout_toEndOf="@+id/ll_tap" android:gravity="center" android:textColor="#ffffff" android:textSize="11.5sp" diff --git a/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_left.xml b/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_left.xml index dd9c729..6c09831 100644 --- a/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_left.xml +++ b/FlycoTabLayoutZ_Lib/src/main/res/layout/layout_tab_left.xml @@ -26,8 +26,7 @@ android:singleLine="true"/> - - tabBeanLists = new ArrayList(); + private List tabBeanLists = new ArrayList(); private List fragments = new ArrayList(); private String[] mAllTitle = new String[]{"我的", "AI+学习", "语文", "数学", "英语", "其他学科", "读书", "绿色安全",}; @@ -190,6 +195,9 @@ public class HomeActivity extends BaseMvvmActivity { + public String apkName; + public Drawable appIcon; + public String appName; + public String appVersion; + public String className; + public String fileName; + public int fileSize; + public String forceUpdate; + + public Long id; + public int index; + public Intent intent; + public int isSystem; + public String jumpType; + public int localVer; + public String localVer2; + public String mStargss; + public String packageName; + public String updateContent; + public String url; + public int versionCode; + public String versionName; + + private AppInfo(Parcel in) { + apkName = in.readString(); + appName = in.readString(); + appVersion = in.readString(); + className = in.readString(); + fileName = in.readString(); + fileSize = in.readInt(); + forceUpdate = in.readString(); + if (in.readByte() == 0) { + id = null; + } else { + id = in.readLong(); + } + index = in.readInt(); + intent = in.readParcelable(Intent.class.getClassLoader()); + isSystem = in.readInt(); + jumpType = in.readString(); + localVer = in.readInt(); + localVer2 = in.readString(); + mStargss = in.readString(); + packageName = in.readString(); + updateContent = in.readString(); + url = in.readString(); + versionCode = in.readInt(); + versionName = in.readString(); + } + + public static final Creator CREATOR = new Creator() { + @Override + public AppInfo createFromParcel(Parcel in) { + return new AppInfo(in); + } + + @Override + public AppInfo[] newArray(int size) { + return new AppInfo[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int i) { + parcel.writeString(apkName); + parcel.writeString(appName); + parcel.writeString(appVersion); + parcel.writeString(className); + parcel.writeString(fileName); + parcel.writeInt(fileSize); + parcel.writeString(forceUpdate); + if (id == null) { + parcel.writeByte((byte) 0); + } else { + parcel.writeByte((byte) 1); + parcel.writeLong(id); + } + parcel.writeInt(index); + parcel.writeParcelable(intent, i); + parcel.writeInt(isSystem); + parcel.writeString(jumpType); + parcel.writeInt(localVer); + parcel.writeString(localVer2); + parcel.writeString(mStargss); + parcel.writeString(packageName); + parcel.writeString(updateContent); + parcel.writeString(url); + parcel.writeInt(versionCode); + parcel.writeString(versionName); + } + + private AppInfo(Builder builder) { + this.versionCode = 0; + this.localVer = 0; + this.appName = builder.appName; + this.appIcon = builder.appIcon; + this.intent = builder.intent; + this.packageName = builder.packageName; + this.mStargss = builder.mStargss; + this.jumpType = builder.jumpType; + this.isSystem = builder.isSystem; + this.fileName = builder.fileName; + } + + public AppInfo() { + this.versionCode = 0; + this.localVer = 0; + } + + @Override + public int compareTo(AppInfo appInfo) { + return Integer.compare(getIndex(), appInfo.getIndex()); + } + + public int getIndex() { + return this.index; + } + + public void setIndex(int i) { + this.index = i; + } + + public int getIsSystem() { + return this.isSystem; + } + + public void setIsSystem(int i) { + this.isSystem = i; + } + + public String getJumpType() { + return this.jumpType; + } + + public void setJumpType(String str) { + this.jumpType = str; + } + + public String getmStargss() { + return this.mStargss; + } + + public void setmStargss(String str) { + this.mStargss = str; + } + + public String getAppLabel() { + return this.appName; + } + + public void setAppLabel(String str) { + this.appName = str; + } + + public Drawable getAppIcon() { + return this.appIcon; + } + + public void setAppIcon(Drawable drawable) { + this.appIcon = drawable; + } + + public Intent getIntent() { + return this.intent; + } + + public void setIntent(Intent intent) { + this.intent = intent; + } + + public String getPkgName() { + return this.packageName; + } + + public void setPkgName(String str) { + this.packageName = str; + } + + public String getFileName() { + return this.fileName; + } + + public void setFileName(String str) { + this.fileName = str; + } + + public String getAppVersion() { + return this.appVersion; + } + + public void setAppVersion(String str) { + this.appVersion = str; + } + + + public static class Builder { + public Drawable appIcon; + public String appName; + public String fileName; + public Intent intent; + public int isSystem; + public String jumpType; + public String mStargss; + public String packageName; + + public Builder appJumpType(String str) { + this.jumpType = str; + return this; + } + + public Builder appLabel(String str) { + this.appName = str; + return this; + } + + public Builder appStargs(String str) { + this.mStargss = str; + return this; + } + + public Builder appStargsAdd(String str, Fragment fragment) { + this.mStargss = str; +// MyApp.getInstance().mBottomBtnOnClickListener.setFragment(fragment); + return this; + } + + public Builder appIcon(Drawable drawable) { + this.appIcon = drawable; + return this; + } + + public Builder intent(Intent intent) { + this.intent = intent; + return this; + } + + public Builder pkgName(String str) { + this.packageName = str; + return this; + } + + public Builder isSystem(int i) { + this.isSystem = i; + return this; + } + + public Builder fileName(String str) { + this.fileName = str; + return this; + } + + public AppInfo build() { + return new AppInfo(this); + } + } + + @NotNull + @Override + public String toString() { + return "AppInfo{appIcon=" + this.appIcon + ", mStargss='" + this.mStargss + "', jumpType='" + this.jumpType + "'}"; + } +} diff --git a/app/src/main/java/com/xwad/os/bean/jxw/AppUseInfo.java b/app/src/main/java/com/xwad/os/bean/jxw/AppUseInfo.java new file mode 100644 index 0000000..d15cdba --- /dev/null +++ b/app/src/main/java/com/xwad/os/bean/jxw/AppUseInfo.java @@ -0,0 +1,110 @@ +package com.xwad.os.bean.jxw; + +import java.io.Serializable; + +public class AppUseInfo implements Serializable { + private Long createTime; + private Integer devilDeviceId; + private Integer enabled; + private Object iconBase64; + private String iconUrl; + + private Integer id; + private Integer limitTime; + private String packageName; + private String title; + private Long updateTime; + private String version; + + public String toString() { + return "AppUseInfo{id=" + this.id + ", devilDeviceId=" + this.devilDeviceId + ", packageName='" + this.packageName + "', version='" + this.version + "', title='" + this.title + "', iconUrl='" + this.iconUrl + "', createTime=" + this.createTime + ", updateTime=" + this.updateTime + ", iconBase64=" + this.iconBase64 + ", enabled=" + this.enabled + ", limitTime=" + this.limitTime + '}'; + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer num) { + this.id = num; + } + + public Integer getDevilDeviceId() { + return this.devilDeviceId; + } + + public void setDevilDeviceId(Integer num) { + this.devilDeviceId = num; + } + + public String getPackageName() { + return this.packageName; + } + + public void setPackageName(String str) { + this.packageName = str; + } + + public String getVersion() { + return this.version; + } + + public void setVersion(String str) { + this.version = str; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String str) { + this.title = str; + } + + public String getIconUrl() { + return this.iconUrl; + } + + public void setIconUrl(String str) { + this.iconUrl = str; + } + + public Long getCreateTime() { + return this.createTime; + } + + public void setCreateTime(Long l) { + this.createTime = l; + } + + public Long getUpdateTime() { + return this.updateTime; + } + + public void setUpdateTime(Long l) { + this.updateTime = l; + } + + public Object getIconBase64() { + return this.iconBase64; + } + + public void setIconBase64(Object obj) { + this.iconBase64 = obj; + } + + public Integer getEnabled() { + return this.enabled; + } + + public void setEnabled(Integer num) { + this.enabled = num; + } + + public Integer getLimitTime() { + return this.limitTime; + } + + public void setLimitTime(Integer num) { + this.limitTime = num; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/bean/jxw/GkAppUseInfo.java b/app/src/main/java/com/xwad/os/bean/jxw/GkAppUseInfo.java new file mode 100644 index 0000000..d0125dc --- /dev/null +++ b/app/src/main/java/com/xwad/os/bean/jxw/GkAppUseInfo.java @@ -0,0 +1,23 @@ +package com.xwad.os.bean.jxw; + +import android.content.Intent; + +import java.util.List; + +public class GkAppUseInfo { + private static GkAppUseInfo gkAppUseInfo; + public List datas; + + public static GkAppUseInfo getGkAppUseInfo() { + if (gkAppUseInfo == null) { + gkAppUseInfo = new GkAppUseInfo(); + } + return gkAppUseInfo; + } + + public void getAppUseInfo() { + Intent intent = new Intent(); + intent.setAction("com.jxw.get_app"); +// MyApp.getInstance().sendBroadcast(intent); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java b/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java index 3f3a127..dfd6559 100644 --- a/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java +++ b/app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java @@ -1,16 +1,49 @@ package com.xwad.os.fragment.safe; +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.os.Bundle; +import android.os.Handler; +import android.text.TextUtils; import android.util.Log; import android.view.View; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.tencent.mmkv.MMKV; import com.xwad.os.R; import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment; +import com.xwad.os.bean.jxw.AppInfo; import com.xwad.os.config.CommonConfig; import com.xwad.os.databinding.FragmentSafeBinding; -import com.tencent.mmkv.MMKV; +import com.xwad.os.jxw.AssertUtils; +import com.xwad.os.jxw.event.GkEvent; +import com.xwad.os.view.jxw.view.dialog.QhbzDialog; +import com.xwad.os.jxw.StudyRecordMng; +import com.xwad.os.jxw.ToastUtil; +import com.xwad.os.jxw.event.UpdateColorEvent; +import com.xwad.os.utils.OpenApkUtils; +import com.xwad.os.view.jxw.view.dialog.RemoveAppDialog; +import com.xwad.os.view.jxw.widget.RecyclerMarginClickHelper; + +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * A simple {@link Fragment} subclass. @@ -18,10 +51,20 @@ import com.tencent.mmkv.MMKV; * create an instance of this fragment. */ public class SafeFragment extends BaseMvvmFragment { - private static final String TAG = "PrecisionFragment"; + private static final String TAG = "SafeFragment"; + + private Activity mContext; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + private AppInfo addAppinfo; + private AssertUtils.ZhMenuAdapter zhMenuAdapter; + private List mlistAppInfo = new ArrayList<>(); + private Handler mHandler = new Handler(); + public String file_name = "app_list_6.0"; + int len = 0; + + // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -60,6 +103,7 @@ public class SafeFragment extends BaseMvvmFragment it = mlistAppInfo.iterator(); + while (it.hasNext()) { + AppInfo appInfo = it.next(); + if (!TextUtils.isEmpty(appInfo.getPkgName()) && appInfo.getPkgName().equals(stringExtra)) { + ToastUtil.showTextToastDia("不能重复添加！"); + return; + } + } + PackageManager packageManager = mContext.getPackageManager(); + try { + ApplicationInfo applicationInfo = packageManager.getApplicationInfo(stringExtra, PackageManager.GET_META_DATA); + AppInfo build = new AppInfo.Builder().appLabel((String) packageManager.getApplicationLabel(applicationInfo)).pkgName(stringExtra).appIcon(packageManager.getApplicationIcon(applicationInfo)).build(); + mlistAppInfo.remove(addAppinfo); + mlistAppInfo.add(build); + mlistAppInfo.add(addAppinfo); + zhMenuAdapter.setData(mlistAppInfo); + zhMenuAdapter.notifyDataSetChanged(); + writeAppDate(stringExtra); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + } + } + + private void writeAppDate(String str) { + try { + FileOutputStream fileOutputStream = new FileOutputStream(mContext.getFileStreamPath("app_list_6.0"), true); + fileOutputStream.write((str + "\n").getBytes()); + fileOutputStream.flush(); + fileOutputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEvent(GkEvent gkEvent) { + zhMenuAdapter.notifyDataSetChanged(); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEvent(UpdateColorEvent updateColorEvent) { + zhMenuAdapter.notifyDataSetChanged(); + } + + public void initAppData() { + AppInfo build = new AppInfo.Builder().appLabel("课程表").appStargs(getResources().getString(R.string.tag_args_new_kcb)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_kcb)).build(); + AppInfo build2 = new AppInfo.Builder().appLabel("语音翻译").appStargs(getResources().getString(R.string.tag_args_new_zyhy)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yyfy)).build(); + AppInfo build3 = new AppInfo.Builder().appLabel("使用助手").appStargs(getResources().getString(R.string.tag_args_new_sysmx)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_syzs)).build(); + AppInfo build4 = new AppInfo.Builder().appLabel("应用更新").appStargs(getResources().getString(R.string.tag_args_updae)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yygx)).build(); + AppInfo build5 = new AppInfo.Builder().appLabel("一键加速").appStargs(getResources().getString(R.string.tag_args_new_yjjs)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yjjs)).build(); + AppInfo build6 = new AppInfo.Builder().appLabel("下载中心").appStargs(getResources().getString(R.string.tag_args_new_download)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_xzzx)).build(); + AppInfo build7 = new AppInfo.Builder().appLabel("切换壁纸").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_qhbz)).build(); + AppInfo build8 = new AppInfo.Builder().appLabel("安卓平台").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_azpt)).build(); + AppInfo build9 = new AppInfo.Builder().appLabel("设置").appStargs(getResources().getString(R.string.tag_args_new_jxwSettings)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_sz)).build(); + mlistAppInfo.add(build); + mlistAppInfo.add(build2); + mlistAppInfo.add(build3); + mlistAppInfo.add(build4); + mlistAppInfo.add(build5); + mlistAppInfo.add(build6); + mlistAppInfo.add(build7); + mlistAppInfo.add(build8); + mlistAppInfo.add(build9); + getAppData(); + mHandler.post(new Runnable() { + @Override + public void run() { + zhMenuAdapter.setData(mlistAppInfo); + zhMenuAdapter.notifyDataSetChanged(); + } + }); + } + + private void getAppData() { + File fileStreamPath = mContext.getFileStreamPath(file_name); + if (!fileStreamPath.exists()) { + return; + } + try { + BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath)); + PackageManager packageManager = mContext.getPackageManager(); + while (true) { + String readLine = bufferedReader.readLine(); + if (readLine != null) { + try { + ApplicationInfo applicationInfo = packageManager.getApplicationInfo(readLine, PackageManager.GET_META_DATA); + mlistAppInfo.add(new AppInfo.Builder().appLabel((String) packageManager.getApplicationLabel(applicationInfo)).pkgName(readLine).appIcon(packageManager.getApplicationIcon(applicationInfo)).build()); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + } else { + bufferedReader.close(); + return; + } + } + } catch (FileNotFoundException e2) { + e2.printStackTrace(); + } catch (IOException e3) { + e3.printStackTrace(); + } + } + + + void startApkByPackName(Context context, String str) { + try { + context.startActivity(context.getPackageManager().getLaunchIntentForPackage(str)); + StudyRecordMng.startCount(context, str, "", "", true); + } catch (Exception e) { + Log.d("zzj", "startApkByPackName error : " + e.toString()); + ToastUtil.showTextToastDia("此应用已经被家长管控"); + } + } + + + public String readContent(String str, int i) { + File fileStreamPath = mContext.getFileStreamPath(file_name); + if (!fileStreamPath.exists()) { + return null; + } + try { + BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath)); + int i2 = len; + String str2 = ""; + Log.e(TAG, "pkg = " + str + "poi=" + i); + while (true) { + String readLine = bufferedReader.readLine(); + if (readLine != null) { + Log.e(TAG, "line " + readLine); + if (!readLine.equals(str)) { + str2 = str2 + readLine + "\n"; + } + } else { + bufferedReader.close(); + FileOutputStream fileOutputStream = new FileOutputStream(fileStreamPath, false); + Log.e(TAG, "sb = " + str2); + fileOutputStream.write(str2.getBytes()); + fileOutputStream.flush(); + fileOutputStream.close(); + return null; + } + } + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + public class BtnClick { - public void openPrecisionHome(View view) { + public void x(View view) { } } diff --git a/app/src/main/java/com/xwad/os/jxw/AssertUtils.java b/app/src/main/java/com/xwad/os/jxw/AssertUtils.java index d830ee4..435a957 100644 --- a/app/src/main/java/com/xwad/os/jxw/AssertUtils.java +++ b/app/src/main/java/com/xwad/os/jxw/AssertUtils.java @@ -1,10 +1,30 @@ package com.xwad.os.jxw; import android.content.Context; +import android.os.Handler; +import android.text.TextUtils; +import android.util.Log; +import android.view.View; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.request.RequestOptions; +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; import com.google.gson.Gson; +import com.xwad.os.R; +import com.xwad.os.bean.jxw.AppInfo; +import com.xwad.os.bean.jxw.AppUseInfo; +import com.xwad.os.bean.jxw.GkAppUseInfo; +import com.xwad.os.view.jxw.view.dialog.LockDialog; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.util.List; public class AssertUtils { public static final Gson mGson = new Gson(); @@ -46,4 +66,124 @@ public class AssertUtils { public static int getDimens(Context context, String str) { return context.getResources().getDimensionPixelSize(context.getResources().getIdentifier(str, "dimen", context.getPackageName())); } + + public static class ZhMenuAdapter extends BaseQuickAdapter { + private Context context; + private List data; + private List gkAppData; + private RadiaoOnItemClickListener listener; + private Handler mHandler; + public int remove_position; + private boolean xiezai; + + public interface RadiaoOnItemClickListener { + void onDeleteClick(String str, int i, String str2); + + void onSelectClick(int i); + } + + public boolean getToDelete() { + return this.xiezai; + } + + public void setToDelete(boolean z) { + this.xiezai = z; + notifyDataSetChanged(); + } + + public void setData(List list) { + this.data = list; + notifyDataSetChanged(); + } + + public ZhMenuAdapter(Context context, List list) { + super(R.layout.item_app_gk, list); + this.xiezai = false; + this.remove_position = -1; + this.mHandler = new Handler(); + this.context = context; + } + + @Override + public void convert(final BaseViewHolder baseViewHolder, final AppInfo appInfo) { + try { + TextView textView = baseViewHolder.getView(R.id.app_name); + ImageView imageView = baseViewHolder.getView(R.id.app_icon); + ImageView imageView2 = baseViewHolder.getView(R.id.delet_iv); + RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_jinyong); + RelativeLayout relativeLayout2 = baseViewHolder.getView(R.id.rl_xzsy); + textView.setText(appInfo.appName); + if (SPUtils.getInt(this.mContext, "themenBg", 0) == 1) { + textView.setTextColor(-10066330); + } else { + textView.setTextColor(-1); + } + Glide.with(imageView).load(appInfo.getAppIcon()).apply(RequestOptions.bitmapTransform(new RoundedCorners((int) this.mContext.getResources().getDimension(R.dimen.x20)))).into(imageView); + relativeLayout.setVisibility(8); + relativeLayout2.setVisibility(8); + if (GkAppUseInfo.getGkAppUseInfo().datas != null) { + for (AppUseInfo appUseInfo : GkAppUseInfo.getGkAppUseInfo().datas) { + Log.e("jxw", appInfo.packageName + "--" + appUseInfo.getPackageName()); + if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 0)) { + Log.e("jxw-", "禁止使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName()); + relativeLayout.setVisibility(0); + break; + } else if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 2) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 2)) { + Log.e("jxw-", "限制使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName()); + relativeLayout2.setVisibility(0); + break; + } + } + } + if (!this.xiezai) { + imageView2.setVisibility(8); + } else { + imageView2.setVisibility(0); + } + imageView2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (ZhMenuAdapter.this.listener != null) { + ZhMenuAdapter.this.listener.onDeleteClick(appInfo.packageName, baseViewHolder.getAdapterPosition(), appInfo.appName); + } + } + }); + if (!this.xiezai) { + imageView2.setVisibility(8); + } else if (!TextUtils.isEmpty(appInfo.packageName) && appInfo.getIntent() == null) { + imageView2.setVisibility(0); + } else { + imageView2.setVisibility(8); + } + baseViewHolder.addOnLongClickListener(R.id.app_icon); + imageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (GkAppUseInfo.getGkAppUseInfo().datas != null) { + for (AppUseInfo appUseInfo2 : GkAppUseInfo.getGkAppUseInfo().datas) { + Log.e("jxw", appInfo.packageName + "--" + appUseInfo2.getPackageName()); + if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled().intValue() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled().intValue() == 0)) { + new LockDialog(ZhMenuAdapter.this.mContext, appInfo.appName).show(); + return; + } + } + } + if (ZhMenuAdapter.this.listener != null) { + ZhMenuAdapter.this.listener.onSelectClick(baseViewHolder.getAdapterPosition()); + } + } + }); + } catch (Exception unused) { + } + } + + public void setGkApp(List list) { + this.gkAppData = list; + notifyDataSetChanged(); + } + + public void setOnItemClickListener(RadiaoOnItemClickListener radiaoOnItemClickListener) { + this.listener = radiaoOnItemClickListener; + } + } } diff --git a/app/src/main/java/com/xwad/os/jxw/StudyRecordBaseName.java b/app/src/main/java/com/xwad/os/jxw/StudyRecordBaseName.java new file mode 100644 index 0000000..3e7c4ed --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/StudyRecordBaseName.java @@ -0,0 +1,197 @@ +package com.xwad.os.jxw; + +import android.text.TextUtils; + +public class StudyRecordBaseName { + private static final String CLOUD_HG_EXAM = "黄冈考点"; + private static final String CLOUD_HG_HAI_DIAN = "名师课堂"; + private static final String CLOUD_MY_APP = "我的应用"; + private static final String CLOUD_PARENTS_MNG = "家长管理"; + private static final String CLOUD_STUDY_DIAGNOSE = "学习诊断"; + private static final String CLOUD_TB_BOOK = "同步书苑"; + private static final String CLOUD_THEME_STYLE = "主题风格"; + private static final String CLOUD_VH_BOOK = "万虹书苑"; + private static final String CLOUD_WRONG_RECORD = "错题本"; + private static final String DICT_ANCIENT_CN = "古汉语词典"; + private static final String DICT_ANCIENT_POETIC = "古诗文词典"; + private static final String DICT_CN = "汉语词典"; + private static final String DICT_CN_EN = "汉英大词典"; + private static final String DICT_EN_CN = "英汉大词典"; + private static final String DICT_IDIOM = "成语词典"; + private static final String DICT_LONGMAN_DANG_DAI = "朗文当代"; + private static final String DICT_LONGMAN_SHUANG_JIE = "朗文双解"; + private static final String DICT_MIDDLE_PRIMARY_EN_CN = "中小学英汉词典"; + private static final String DICT_NEW_WORD = "生词库"; + private static final String DICT_PROFESSION = "专业词典"; + private static final String DICT_TONG_FAN_YI = "同反义词典"; + private static final String DICT_XIN_HUA = "新华字典"; + private static final String EN_PHONETIC = "国际音标"; + private static final String MORE_CALC = "计算器"; + private static final String MORE_CAMERA = "照相机"; + private static final String MORE_FILE_MNG = "文件管理"; + private static final String MORE_MOVIE = "影视厅"; + private static final String MORE_MUSIC = "音乐盒"; + private static final String MORE_PHOTO = "相册簿"; + private static final String MORE_RECORDER = "录音机"; + private static final String MORE_SYSTEM_MNG = "系统管家"; + private static final String MORE_SYSTEM_SETTING = "系统设置"; + private static final String SECOND_LINE_COMPOSITION = "在线作文"; + private static final String SECOND_LINE_DOWNLOAD = "应用下载"; + private static final String SECOND_LINE_EXAM = "考试中心"; + private static final String SECOND_LINE_EXCHANGE = "交流中心"; + private static final String SECOND_LINE_GREEN_WEB = "绿色云学网"; + private static final String SECOND_LINE_QA = "一对一答疑"; + private static final String SECOND_LINE_SEARCH = "在线搜学"; + private static final String SECOND_LINE_TEACH = "在线教学"; + + public static String getOtherComName(String str, String str2) { + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_VH_BOOK, str2, StudyRecordAPKInfo.CLASS_VH_BOOK)) { + return CLOUD_VH_BOOK; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_TB_BOOK, str2, StudyRecordAPKInfo.CLASS_TB_BOOK)) { + return CLOUD_TB_BOOK; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PARENTS_MNG, str2, StudyRecordAPKInfo.CLASS_PARENTS_MNG)) { + return CLOUD_PARENTS_MNG; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_STUDY_DIAGNOSE, str2, StudyRecordAPKInfo.CLASS_STUDY_DIAGNOSE)) { + return CLOUD_STUDY_DIAGNOSE; + } + if (isSamePackageClassName(str, "com.jxw.examsystem", str2, StudyRecordAPKInfo.CLASS_WRONG_RECORD)) { + return CLOUD_WRONG_RECORD; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_THEME_STYLE, str2, StudyRecordAPKInfo.CLASS_THEME_STYLE)) { + return CLOUD_THEME_STYLE; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_MY_APP, str2, StudyRecordAPKInfo.CLASS_MY_APP)) { + return CLOUD_MY_APP; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PHONETIC, str2, StudyRecordAPKInfo.CLASS_PHONETIC)) { + return EN_PHONETIC; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PROFESSION, str2, StudyRecordAPKInfo.CLASS_PROFESSION)) { + return DICT_PROFESSION; + } + if (isSamePackageClassName(str, "com.jxw.launcher", str2, StudyRecordAPKInfo.CLASS_NEW_WORD)) { + return DICT_NEW_WORD; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_MUSIC, str2, StudyRecordAPKInfo.CLASS_MUSIC)) { + return MORE_MUSIC; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_CAMERA, str2, StudyRecordAPKInfo.CLASS_CAMERA)) { + return MORE_CAMERA; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PHOTO, str2, StudyRecordAPKInfo.CLASS_PHOTO)) { + return MORE_PHOTO; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_RECORDER, str2, StudyRecordAPKInfo.CLASS_RECORDER)) { + return MORE_RECORDER; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_CALC, str2, StudyRecordAPKInfo.CLASS_CALC)) { + return MORE_CALC; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_FILE_MNG, str2, StudyRecordAPKInfo.CLASS_FILE_MNG)) { + return MORE_FILE_MNG; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SYSTEM_MNG, str2, StudyRecordAPKInfo.CLASS_SYSTEM_MNG)) { + return MORE_SYSTEM_MNG; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SYSTEM_SETTING, str2, StudyRecordAPKInfo.CLASS_SYSTEM_SETTING)) { + return MORE_SYSTEM_SETTING; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_QA, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_QA)) { + return SECOND_LINE_QA; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_EXAM, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_EXAM)) { + return SECOND_LINE_EXAM; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_TEACH, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_TEACH)) { + return SECOND_LINE_TEACH; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_SEARCH, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_SEARCH)) { + return SECOND_LINE_SEARCH; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_COMPOSITION, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_COMPOSITION)) { + return SECOND_LINE_COMPOSITION; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_GREEN_WEB, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_GREEN_WEB)) { + return SECOND_LINE_GREEN_WEB; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_EXCHANGE, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_EXCHANGE)) { + return SECOND_LINE_EXCHANGE; + } + if (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SECOND_LINE_DOWNLOAD, str2, StudyRecordAPKInfo.CLASS_SECOND_LINE_DOWNLOAD)) { + return SECOND_LINE_DOWNLOAD; + } + return null; + } + + public static String getFileListName(String str, String str2, String str3) { + if (TextUtils.isEmpty(str3) || !isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_NAME_FILE_LIST, str2, StudyRecordAPKInfo.CLASS_NAME_FILE_LIST)) { + return null; + } + if (str3.equals("1")) { + return CLOUD_HG_EXAM; + } + if (str3.equals(StudyRecordAPKInfo.ARG_FILE_LIST_MOVIE)) { + return MORE_MOVIE; + } + if (str3.equals(StudyRecordAPKInfo.ARG_FILE_LIST_HG)) { + return CLOUD_HG_HAI_DIAN; + } + return null; + } + + public static String getDictName(String str, String str2, String str3) { + if (TextUtils.isEmpty(str3) || !isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_NAME_DICT, str2, StudyRecordAPKInfo.CLASS_NAME_DICT)) { + return null; + } + if (str3.equals("朗文当代")) { + return "朗文当代"; + } + if (str3.equals("朗文双解")) { + return "朗文双解"; + } + if (str3.equals("英汉大词典")) { + return "英汉大词典"; + } + if (str3.equals("汉英大词典")) { + return "汉英大词典"; + } + if (str3.equals("汉语词典")) { + return "汉语词典"; + } + if (str3.equals("新华字典")) { + return "新华字典"; + } + if (str3.equals("古汉语词典")) { + return "古汉语词典"; + } + if (str3.equals("古诗文词典")) { + return "古诗文词典"; + } + if (str3.equals("中小学英汉词典")) { + return "中小学英汉词典"; + } + if (str3.equals("成语词典")) { + return "成语词典"; + } + if (str3.equals("同反义词典")) { + return "同反义词典"; + } + return null; + } + + public static boolean isSamePackageClassName(String str, String str2, String str3, String str4) { + return str.equals(str2) && str3.equals(str4); + } + + public static String getFileName(String str, boolean z) { + int lastIndexOf; + if (TextUtils.isEmpty(str)) { + return str; + } + String substring = str.substring(str.lastIndexOf(47) + 1); + return (!z || (lastIndexOf = substring.lastIndexOf(46)) < 0) ? substring : substring.substring(0, lastIndexOf); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/StudyRecordMiddleName.java b/app/src/main/java/com/xwad/os/jxw/StudyRecordMiddleName.java new file mode 100644 index 0000000..8c203e9 --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/StudyRecordMiddleName.java @@ -0,0 +1,208 @@ +package com.xwad.os.jxw; + +import android.text.TextUtils; +import android.util.Log; + +public class StudyRecordMiddleName extends StudyRecordBaseName { + private static final String CH_BASE_WORD = "文科-基础词语"; + private static final String CH_CHAR_KNOWLEDGE = "文科-汉字知识"; + private static final String CH_CLASSIC_CH = "文科-文言文"; + private static final String CH_CLASSIC_POETRY = "文科-古诗词曲"; + private static final String CH_PUNCTUATION = "文科-标点符号"; + private static final String CH_READ = "文科-现代文阅读"; + private static final String CH_RHETORIC = "文科-修辞方法"; + private static final String CH_SENTENCE = "文科-句子知识"; + private static final String CH_WRITING = "文科-语文写作"; + private static final String EN_BASE_VOICE = "英语-基础语音"; + private static final String EN_GRAMMAR = "英语-英语语法"; + private static final String EN_LISTENING_TRAINING = "英语-听力训练"; + private static final String EN_READ = "英语-英语阅读"; + private static final String EN_SPOKEN = "英语-口语交际"; + private static final String EN_VOCABULARY = "英语-英语词汇"; + private static final String EN_WRITING = "英语-英语写作"; + private static final String MATH_EASY_WRONG_TOPIC = "理科-数学易错题汇"; + private static final String MATH_EQUATION = "理科-方程精解"; + private static final String MATH_FORMULA = "理科-公式大全"; + private static final String MATH_FUNC = "理科-函数解析"; + private static final String MATH_GEOMETRY = "理科-几何定理"; + private static final String MATH_OFTEN_TEST = "理科-数学常考知识"; + private static final String MATH_PERIODIC_TABLE = "理科-元素周期表"; + private static final String MATH_PREPARE_TEST = "理科-备战中高考"; + private static final String MORE_USER_GUIDE = "更多-使用指南"; + private static final String SYNSTUDYDD_CN = "同步点读-语文"; + private static final String SYNSTUDYDD_EN = "同步点读-英语"; + private static final String SYNSTUDYDD_MATH = "同步点读-数学"; + private static final String SYNSTUDYFD_BIOLOGY = "同步辅导-生物"; + private static final String SYNSTUDYFD_CHEMISTRY = "同步辅导-化学"; + private static final String SYNSTUDYFD_CN = "同步辅导-语文"; + private static final String SYNSTUDYFD_EN = "同步辅导-英语"; + private static final String SYNSTUDYFD_GEOGRAPHY = "同步辅导-地理"; + private static final String SYNSTUDYFD_HISTORY = "同步辅导-历史"; + private static final String SYNSTUDYFD_KEXUE = "同步辅导-科学"; + private static final String SYNSTUDYFD_MATH = "同步辅导-数学"; + private static final String SYNSTUDYFD_PHYSICS = "同步辅导-物理"; + private static final String SYNSTUDYFD_POLITICS = "同步辅导-政治"; + private static final String SYNSTUDY_BIOLOGY = "同步学习-生物"; + private static final String SYNSTUDY_CHEMISTRY = "同步学习-化学"; + private static final String SYNSTUDY_CN = "同步学习-语文"; + private static final String SYNSTUDY_EN = "同步学习-英语"; + private static final String SYNSTUDY_GEOGRAPHY = "同步学习-地理"; + private static final String SYNSTUDY_HISTORY = "同步学习-历史"; + private static final String SYNSTUDY_MATH = "同步学习-数学"; + private static final String SYNSTUDY_PHYSICS = "同步学习-物理"; + private static final String SYNSTUDY_POLITICS = "同步学习-政治"; + private static final String TAG = "StudyRecordMiddleName"; + + public static String getName(String str, String str2, String str3) { + if (TextUtils.isEmpty(str) || TextUtils.isEmpty(str2)) { + Log.i(TAG, "getName(): packageName or className is empty"); + return null; + } + String onLineStudyName = getOnLineStudyName(str, str2, str3); + if (TextUtils.isEmpty(onLineStudyName)) { + String fileListName = getFileListName(str, str2, str3); + if (TextUtils.isEmpty(fileListName)) { + String dictName = getDictName(str, str2, str3); + if (TextUtils.isEmpty(dictName)) { + String otherComName = getOtherComName(str, str2); + return (TextUtils.isEmpty(otherComName) && isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PERIODIC_TABLE, str2, StudyRecordAPKInfo.CLASS_PERIODIC_TABLE)) ? MATH_PERIODIC_TABLE : otherComName; + } + return dictName; + } + return fileListName; + } + return onLineStudyName; + } + + private static String getOnLineStudyName(String str, String str2, String str3) { + String str4; + if (TextUtils.isEmpty(str3) || !str.equals(StudyRecordAPKInfo.PACKAGE_NAME_ON_LINE_STUDY)) { + return null; + } + if (str2.equals(StudyRecordAPKInfo.CLASS_NAME_ON_LINE_STUDY)) { + String fileName = getFileName(str3, true); + if (TextUtils.isEmpty(fileName)) { + return null; + } + if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_EN_BASE_VOICE)) { + str4 = EN_BASE_VOICE; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_EN_VOCABULARY)) { + str4 = EN_VOCABULARY; + } else if (fileName.equals("口语交际")) { + str4 = EN_SPOKEN; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_EN_LISTENING_TRAINING)) { + str4 = EN_LISTENING_TRAINING; + } else if (fileName.equals("英语阅读")) { + str4 = EN_READ; + } else if (fileName.equals("英语语法")) { + str4 = EN_GRAMMAR; + } else if (fileName.equals("英语写作")) { + str4 = EN_WRITING; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_CHAR_KNOWLEDGE)) { + str4 = CH_CHAR_KNOWLEDGE; + } else if (fileName.equals("基础词语")) { + str4 = CH_BASE_WORD; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_SENTENCE)) { + str4 = CH_SENTENCE; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_PUNCTUATION)) { + str4 = CH_PUNCTUATION; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_RHETORIC)) { + str4 = CH_RHETORIC; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_CLASSIC_POETRY)) { + str4 = CH_CLASSIC_POETRY; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_CLASSIC_CH)) { + str4 = CH_CLASSIC_CH; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_CH_READ)) { + str4 = CH_READ; + } else if (fileName.equals("语文写作")) { + str4 = CH_WRITING; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_FUNC)) { + str4 = MATH_FUNC; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_GEOMETRY)) { + str4 = MATH_GEOMETRY; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_EQUATION)) { + str4 = MATH_EQUATION; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_EASY_WRONG_TOPIC)) { + str4 = MATH_EASY_WRONG_TOPIC; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_OFTEN_TEST)) { + str4 = MATH_OFTEN_TEST; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_PREPARE_TEST)) { + str4 = MATH_PREPARE_TEST; + } else if (fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MID_MATH_FORMULA)) { + str4 = MATH_FORMULA; + } else if (!fileName.equals(StudyRecordAPKInfo.ARG_SUB_ON_LINE_STUDY_MORE_USER_GUIDE)) { + return null; + } else { + str4 = MORE_USER_GUIDE; + } + return str4; + } else if (str2.equals(StudyRecordAPKInfo.CLASS_NAME_ON_LINE_STUDY_LIST)) { + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHFD)) { + return SYNSTUDYFD_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATHFD)) { + return SYNSTUDYFD_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_ENFD)) { + return SYNSTUDYFD_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_PHYSICSFD)) { + return SYNSTUDYFD_PHYSICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHEMISTRYFD)) { + return SYNSTUDYFD_CHEMISTRY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_BIOLOGYFD)) { + return SYNSTUDYFD_BIOLOGY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_HISTORYFD)) { + return SYNSTUDYFD_HISTORY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_GEOGRAPHYFD)) { + return SYNSTUDYFD_GEOGRAPHY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_POLITICSFD)) { + return SYNSTUDYFD_POLITICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHDD)) { + return SYNSTUDYDD_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATHDD)) { + return SYNSTUDYDD_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_ENDD)) { + return SYNSTUDYDD_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CH)) { + return SYNSTUDY_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATH)) { + return SYNSTUDY_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_EN)) { + return SYNSTUDY_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_PHYSICS)) { + return SYNSTUDY_PHYSICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHEMISTRY)) { + return SYNSTUDY_CHEMISTRY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_BIOLOGY)) { + return SYNSTUDY_BIOLOGY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_HISTORY)) { + return SYNSTUDY_HISTORY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_GEOGRAPHY)) { + return SYNSTUDY_GEOGRAPHY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_POLITICS)) { + return SYNSTUDY_POLITICS; + } + return null; + } else { + return null; + } + } +} diff --git a/app/src/main/java/com/xwad/os/jxw/StudyRecordMng.java b/app/src/main/java/com/xwad/os/jxw/StudyRecordMng.java new file mode 100644 index 0000000..a361da9 --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/StudyRecordMng.java @@ -0,0 +1,51 @@ +package com.xwad.os.jxw; + +import android.content.Context; +import android.text.TextUtils; +import android.util.Log; + +public class StudyRecordMng { + private static final long MIN_DURATION_TIME = 1200000; + private static final String TAG = "StudyRecordMng"; + private static long mEnterTime = 0; + private static long mExitTime = 0; + private static boolean mInPrimarySchool = false; + private static String mModulName; + private static int mModulType; + + public static void startCount(Context context, String str, String str2, String str3, boolean z) { + mInPrimarySchool = z; + if (mInPrimarySchool) { + mModulName = StudyRecordPrimaryNameEx.getName(str, str2, str3); + } else { + mModulName = StudyRecordMiddleName.getName(str, str2, str3); + } + if (TextUtils.isEmpty(mModulName)) { + Log.i(TAG, "startCount(): do not need record"); + } else { + mEnterTime = System.currentTimeMillis(); + } + } + + public static void stopCount(Context context) { + if (TextUtils.isEmpty(mModulName)) { + return; + } + mExitTime = System.currentTimeMillis(); + if (MIN_DURATION_TIME <= mExitTime - mEnterTime) { + if (mInPrimarySchool) { + mModulType = 1; + } else { + mModulType = 2; + } + StudyRecorderUtil.insertStudyRecord(context, mModulName, mEnterTime, mExitTime, mModulType); + } else { + Log.i(TAG, "stopCount(): time is not enough, not record"); + } + clearCount(); + } + + public static void clearCount() { + mModulName = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/StudyRecordPrimaryNameEx.java b/app/src/main/java/com/xwad/os/jxw/StudyRecordPrimaryNameEx.java new file mode 100644 index 0000000..e6b5215 --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/StudyRecordPrimaryNameEx.java @@ -0,0 +1,236 @@ +package com.xwad.os.jxw; + +import android.text.TextUtils; +import android.util.Log; + +public class StudyRecordPrimaryNameEx extends StudyRecordBaseName { + private static final String CH_BASE_WORD = "基础词语"; + private static final String CH_CHARACTER = "汉字学习"; + private static final String CH_CLASSIC_CH = "文言文"; + private static final String CH_CLASSIC_POETRY = "古诗词"; + private static final String CH_MODERN_READ = "现代文阅读"; + private static final String CH_PIAN_PANG = "偏旁部首"; + private static final String CH_PIN_YIN = "拼音学习"; + private static final String CH_PUNCTUATION = "标点符号"; + private static final String CH_READ = "阅读指导"; + private static final String CH_RHETORIC = "修辞手法"; + private static final String CH_STROKE_NAME = "笔画名称"; + private static final String CH_STROKE_RULE = "笔顺规则"; + private static final String CH_VALUABLE = "中华宝典"; + private static final String CH_WRITING = "语文写作"; + private static final String EN_GRAMMAR = "英语语法"; + private static final String EN_LETTER = "英文字母"; + private static final String EN_LISTENING_TRAINING = "听力训练"; + private static final String EN_MIDDLE_VOCABULARY = "中学词汇"; + private static final String EN_READ = "英语阅读"; + private static final String EN_SPOKEN = "口语交际"; + private static final String EN_VOCABULARY = "英语词汇"; + private static final String EN_WRITING = "英语写作"; + private static final String FORMULA = "公式大全"; + private static final String MATH_AO_SHU = "奥数训练"; + private static final String MATH_EQUATION = "式与方程"; + private static final String MATH_EQUATION_EXPLAIN = "方程精解"; + private static final String MATH_FORMULA = "数学公式"; + private static final String MATH_FUNC = "函数解析"; + private static final String MATH_GEOMETRY = "几何定理"; + private static final String MATH_KOU_JUE = "算术口诀"; + private static final String MATH_NUMBER = "认识数字"; + private static final String MATH_NUM_ARITHMETIC = "数的运算"; + private static final String MATH_YING_YONG_TI = "应用题训练"; + private static final String MORE_USER_GUIDE = "使用指南"; + private static final String ONLINE_QA = "在线答疑"; + private static final String PERIODIC_TABLE = "元素周期表"; + private static final String PREPARE_TEST = "备战中高考"; + private static final String SIMULATION_TEST = "模拟考场"; + private static final String SYNSTUDYDD_CN = "同步点读-语文"; + private static final String SYNSTUDYDD_EN = "同步点读-英语"; + private static final String SYNSTUDYDD_MATH = "同步点读-数学"; + private static final String SYNSTUDYFD_BIOLOGY = "同步辅导-生物"; + private static final String SYNSTUDYFD_CHEMISTRY = "同步辅导-化学"; + private static final String SYNSTUDYFD_CN = "同步辅导-语文"; + private static final String SYNSTUDYFD_EN = "同步辅导-英语"; + private static final String SYNSTUDYFD_GEOGRAPHY = "同步辅导-地理"; + private static final String SYNSTUDYFD_HISTORY = "同步辅导-历史"; + private static final String SYNSTUDYFD_KEXUE = "同步辅导-科学"; + private static final String SYNSTUDYFD_MATH = "同步辅导-数学"; + private static final String SYNSTUDYFD_PHYSICS = "同步辅导-物理"; + private static final String SYNSTUDYFD_POLITICS = "同步辅导-政治"; + private static final String SYNSTUDY_BIOLOGY = "同步学习-生物"; + private static final String SYNSTUDY_CHEMISTRY = "同步学习-化学"; + private static final String SYNSTUDY_CN = "同步学习-语文"; + private static final String SYNSTUDY_EN = "同步学习-英语"; + private static final String SYNSTUDY_GEOGRAPHY = "同步学习-地理"; + private static final String SYNSTUDY_HISTORY = "同步学习-历史"; + private static final String SYNSTUDY_MATH = "同步学习-数学"; + private static final String SYNSTUDY_PHYSICS = "同步学习-物理"; + private static final String SYNSTUDY_POLITICS = "同步学习-政治"; + private static final String TAG = "StudyRecordPrimaryNameEx"; + + public static String getName(String str, String str2, String str3) { + if (TextUtils.isEmpty(str) || TextUtils.isEmpty(str2)) { + Log.i(TAG, "getName(): packageName or className is empty"); + return null; + } + String onLineStudyName = getOnLineStudyName(str, str2, str3); + if (TextUtils.isEmpty(onLineStudyName)) { + String fileListName = getFileListName(str, str2, str3); + if (TextUtils.isEmpty(fileListName)) { + String dictName = getDictName(str, str2, str3); + if (TextUtils.isEmpty(dictName)) { + String otherComName = getOtherComName(str, str2); + return !TextUtils.isEmpty(otherComName) ? otherComName : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_ONLINE_QA, str2, StudyRecordAPKInfo.CLASS_ONLINE_QA) ? ONLINE_QA : (isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_SIMULATION_TEST, str2, StudyRecordAPKInfo.CLASS_SIMULATION_TEST) || isSamePackageClassName(str, "com.jxw.examsystem", str2, StudyRecordAPKInfo.CLASS_MNKS_TEST)) ? SIMULATION_TEST : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PERIODIC_TABLE, str2, StudyRecordAPKInfo.CLASS_PERIODIC_TABLE) ? PERIODIC_TABLE : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_LETTER, str2, StudyRecordAPKInfo.CLASS_LETTER) ? EN_LETTER : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PIN_YIN, str2, StudyRecordAPKInfo.CLASS_PIN_YIN) ? CH_PIN_YIN : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_STROKE_NAME, str2, "com.example.viewpageindicator.MainActivity") ? CH_STROKE_NAME : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_PIAN_PANG, str2, "com.example.viewpageindicator.MainActivity") ? CH_PIAN_PANG : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_STROKE_RULE, str2, "com.example.viewpageindicator.MainActivity") ? CH_STROKE_RULE : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_CHARACTER, str2, StudyRecordAPKInfo.CLASS_CHARACTER) ? CH_CHARACTER : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_NUMBER, str2, StudyRecordAPKInfo.CLASS_NUMBER) ? MATH_NUMBER : isSamePackageClassName(str, StudyRecordAPKInfo.PACKAGE_KOU_JUE, str2, StudyRecordAPKInfo.CLASS_KOU_JUE) ? MATH_KOU_JUE : otherComName; + } + return dictName; + } + return fileListName; + } + return onLineStudyName; + } + + private static String getOnLineStudyName(String str, String str2, String str3) { + String str4 = ""; + if (TextUtils.isEmpty(str3) || !str.equals(StudyRecordAPKInfo.PACKAGE_NAME_ON_LINE_STUDY)) { + return null; + } + if (str2.equals(StudyRecordAPKInfo.CLASS_NAME_ON_LINE_STUDY)) { + String fileName = getFileName(str3, true); + if (!TextUtils.isEmpty(fileName)) { + if (fileName.equals("备战中高考")) { + return "备战中高考"; + } + if (fileName.equals("公式大全")) { + return "公式大全"; + } + if (fileName.equals("口语交际")) { + return "口语交际"; + } + if (fileName.equals("英语词汇")) { + return "英语词汇"; + } + if (fileName.equals("英语阅读")) { + return "英语阅读"; + } + if (fileName.equals("英语语法")) { + return "英语语法"; + } + if (fileName.equals("英语写作")) { + return "英语写作"; + } + if (fileName.equals("听力训练")) { + return "听力训练"; + } + if (fileName.equals("中学词汇")) { + return "中学词汇"; + } + if (fileName.equals("中华宝典")) { + return "中华宝典"; + } + if (fileName.equals("基础词语")) { + return "基础词语"; + } + if (fileName.equals("古诗词")) { + return "古诗词"; + } + if (fileName.equals("阅读指导")) { + return "阅读指导"; + } + if (fileName.equals("语文写作")) { + return "语文写作"; + } + if (fileName.equals("现代文阅读")) { + str4 = "现代文阅读"; + } else if (fileName.equals("文言文")) { + str4 = "文言文"; + } else if (fileName.equals("修辞手法")) { + str4 = "修辞手法"; + } else if (fileName.equals("标点符号")) { + str4 = "标点符号"; + } else if (fileName.equals("数的运算")) { + str4 = "数的运算"; + } else if (fileName.equals("式与方程")) { + str4 = "式与方程"; + } else if (fileName.equals("应用题训练")) { + str4 = "应用题训练"; + } else if (fileName.equals("奥数训练")) { + str4 = "奥数训练"; + } else if (fileName.equals("数学公式")) { + str4 = "数学公式"; + } else if (fileName.equals("函数解析")) { + str4 = "函数解析"; + } else if (fileName.equals("几何定理")) { + str4 = "几何定理"; + } else if (fileName.equals("方程精解")) { + str4 = "方程精解"; + } else if (fileName.equals("使用指南")) { + str4 = "使用指南"; + } + return str4; + } + } else if (str2.equals(StudyRecordAPKInfo.CLASS_NAME_ON_LINE_STUDY_LIST)) { + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHFD)) { + return SYNSTUDYFD_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATHFD)) { + return SYNSTUDYFD_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_ENFD)) { + return SYNSTUDYFD_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_PHYSICSFD)) { + return SYNSTUDYFD_PHYSICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHEMISTRYFD)) { + return SYNSTUDYFD_CHEMISTRY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_BIOLOGYFD)) { + return SYNSTUDYFD_BIOLOGY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_HISTORYFD)) { + return SYNSTUDYFD_HISTORY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_GEOGRAPHYFD)) { + return SYNSTUDYFD_GEOGRAPHY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_POLITICSFD)) { + return SYNSTUDYFD_POLITICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHDD)) { + return SYNSTUDYDD_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATHDD)) { + return SYNSTUDYDD_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_ENDD)) { + return SYNSTUDYDD_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CH)) { + return SYNSTUDY_CN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_MATH)) { + return SYNSTUDY_MATH; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_EN)) { + return SYNSTUDY_EN; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_PHYSICS)) { + return SYNSTUDY_PHYSICS; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_CHEMISTRY)) { + return SYNSTUDY_CHEMISTRY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_BIOLOGY)) { + return SYNSTUDY_BIOLOGY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_HISTORY)) { + return SYNSTUDY_HISTORY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_GEOGRAPHY)) { + return SYNSTUDY_GEOGRAPHY; + } + if (str3.contains(StudyRecordAPKInfo.ARG_ON_LINE_STUDY_LIST_POLITICS)) { + return SYNSTUDY_POLITICS; + } + } + return null; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/StudyRecorderUtil.java b/app/src/main/java/com/xwad/os/jxw/StudyRecorderUtil.java new file mode 100644 index 0000000..8f3bde1 --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/StudyRecorderUtil.java @@ -0,0 +1,169 @@ +package com.xwad.os.jxw; + +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Log; + +import com.blankj.utilcode.constant.TimeConstants; + +import java.io.IOException; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.FormBody; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +public class StudyRecorderUtil { + public static final String DEFAULT_FORMAT = "yyyy-MM-dd HH:mm:ss"; + public static final String IS_UPLOAD = "is_upload"; + public static final int MIDDLE = 2; + public static final String MODUL_ACTIVITY_DURATION = "modul_activity_duration"; + public static final String MODUL_ENTER_TIME = "modul_enter_time"; + public static final String MODUL_EXIT_TIME = "modul_exit_time"; + public static final String MODUL_NAME = "modul_name"; + public static final String MODUL_TYPE = "modul_type"; + public static final int PRIMARY = 1; + public static final Uri STUDY_RECORDR_URI = Uri.parse("content://com.jxw.studyrecord.provider/studyrecorder"); + + public static Uri insertStudyRecord(Context context, String str, long j, long j2, int i) { + if (TextUtils.isEmpty(str) || j <= 0 || j2 <= 0 || (i != 1 && i != 2)) { + throw new IllegalArgumentException("Bad args: modulName: " + str + " enterTime: " + j + " exitTime: " + j2 + " modulType: " + i); + } + String covertTime = covertTime(j, DEFAULT_FORMAT); + String covertTime2 = covertTime(j2, DEFAULT_FORMAT); + int subTimeStamp2Minute = subTimeStamp2Minute(string2Timestamp(covertTime, DEFAULT_FORMAT), string2Timestamp(covertTime2, DEFAULT_FORMAT)); + Log.e("zzj", "modulName = " + str + " enterT = " + covertTime + " exitT = " + covertTime2 + "duration = " + subTimeStamp2Minute); + ContentResolver contentResolver = context.getContentResolver(); + ContentValues contentValues = new ContentValues(); + contentValues.put("modul_name", str); + contentValues.put("modul_enter_time", covertTime); + contentValues.put("modul_exit_time", covertTime2); + contentValues.put("modul_activity_duration", Integer.valueOf(subTimeStamp2Minute)); + contentValues.put("modul_type", Integer.valueOf(i)); + Uri insert = contentResolver.insert(STUDY_RECORDR_URI, contentValues); + JSONArray jSONArray = new JSONArray(); + JSONObject jSONObject = new JSONObject(); + try { + jSONObject.accumulate("startTime", covertTime); + jSONObject.accumulate("endTime", covertTime2); + jSONObject.accumulate("apkName", str); + jSONArray.put(jSONObject); + } catch (JSONException e) { + e.printStackTrace(); + } + if (jSONArray.length() > 0) { + uploadRecorder(insert, context, jSONArray); + } + return insert; + } + + public static List queryAllStudyRecord(Context context) { + ArrayList arrayList = new ArrayList(); + JSONArray jSONArray = new JSONArray(); + Cursor query = context.getContentResolver().query(STUDY_RECORDR_URI, null, null, null, " _id DESC"); + if (query != null && query.getCount() > 0) { + while (query.moveToNext()) { + StudyRecord studyRecord = new StudyRecord(); + studyRecord.name = query.getString(query.getColumnIndex("modul_name")); + studyRecord.enterTime = query.getString(query.getColumnIndex("modul_enter_time")); + studyRecord.exitTime = query.getString(query.getColumnIndex("modul_exit_time")); + studyRecord.duration = query.getString(query.getColumnIndex("modul_activity_duration")); + studyRecord.type = query.getInt(query.getColumnIndex("modul_type")); + if (query.getInt(query.getColumnIndex("is_upload")) != 1) { + JSONObject jSONObject = new JSONObject(); + try { + jSONObject.accumulate("startTime", studyRecord.enterTime); + jSONObject.accumulate("endTime", studyRecord.exitTime); + jSONObject.accumulate("apkName", studyRecord.name); + jSONArray.put(jSONObject); + } catch (JSONException e) { + e.printStackTrace(); + } + } + arrayList.add(studyRecord); + } + } + if (jSONArray.length() > 0) { + uploadRecorder(STUDY_RECORDR_URI, context, jSONArray); + } + return arrayList; + } + + private static String covertTime(long j, String str) { + return new SimpleDateFormat(DEFAULT_FORMAT, Locale.getDefault()).format(new Date(j)); + } + + private static Timestamp string2Timestamp(String str, String str2) { + Date date; + try { + date = new SimpleDateFormat(str2, Locale.getDefault()).parse(str.replace("Z", " ")); + } catch (ParseException e) { + e.printStackTrace(); + date = null; + } + if (date != null) { + return Timestamp.valueOf(new SimpleDateFormat(str2, Locale.getDefault()).format(date)); + } + return null; + } + + private static int subTimeStamp2Minute(Timestamp timestamp, Timestamp timestamp2) { + return ((int) (timestamp2.getTime() - timestamp.getTime())) / TimeConstants.MIN; + } + + public static class StudyRecord { + public String duration; + public String enterTime; + public String exitTime; + public String name; + public int type; + + public String toString() { + return "StudyRecord [name=" + name + ", enterTime=" + enterTime + ", exitTime=" + exitTime + ", duration=" + duration + ", type=" + type + "]"; + } + } + + public static void uploadRecorder(final Uri uri, final Context context, JSONArray jSONArray) { + OkHttpClient okHttpClient = new OkHttpClient(); + String string = context.getSharedPreferences(Constant.PREFERENCE, 0).getString("series", "unkown"); + Log.e("zzj", "JSONArray=" + jSONArray + ",series=" + string); + okHttpClient.newCall(new Request.Builder().url("http://www.jiumentongbu.com/wechat/device/submitUsed").post(new FormBody.Builder().add("series", string).add("list", jSONArray.toString()).build()).build()).enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) throws IOException { + String string2 = response.body().string(); + Log.e("zzj", "onResponse=" + string2); + try { + if (new JSONObject(string2).optBoolean("success")) { + ContentValues contentValues = new ContentValues(); + contentValues.put("is_upload", 1); + context.getContentResolver().update(uri, contentValues, null, null); + } + } catch (JSONException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Call call, IOException iOException) { + iOException.printStackTrace(); + } + }); + } +} diff --git a/app/src/main/java/com/xwad/os/jxw/event/GkEvent.java b/app/src/main/java/com/xwad/os/jxw/event/GkEvent.java new file mode 100644 index 0000000..5d8df0c --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/event/GkEvent.java @@ -0,0 +1,4 @@ +package com.xwad.os.jxw.event; + +public class GkEvent { +} diff --git a/app/src/main/java/com/xwad/os/jxw/event/UpdateColorEvent.java b/app/src/main/java/com/xwad/os/jxw/event/UpdateColorEvent.java new file mode 100644 index 0000000..ccac1f2 --- /dev/null +++ b/app/src/main/java/com/xwad/os/jxw/event/UpdateColorEvent.java @@ -0,0 +1,4 @@ +package com.xwad.os.jxw.event; + +public class UpdateColorEvent { +} diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/BookFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/BookFragment.java index b6462be..ea174ff 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/BookFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/BookFragment.java @@ -14,12 +14,9 @@ import androidx.fragment.app.FragmentActivity; import com.xwad.os.R; import com.xwad.os.jxw.BaseNewFragment; import com.xwad.os.jxw.CommonUtil; -import com.xwad.os.jxw.Constant; import com.xwad.os.jxw.ToastUtil; import com.xwad.os.jxw.Util; -import org.json.JSONObject; - public class BookFragment extends BaseNewFragment { private String bookId; private String bookurl; @@ -36,10 +33,10 @@ public class BookFragment extends BaseNewFragment { @Override protected void initView() { - this.iv_book_icon = findViewById(R.id.iv_book_icon); - this.tv_book_name = findViewById(R.id.tv_book_name); - this.iv_ksyd = findViewById(R.id.iv_ksyd); - this.ll_data = findViewById(R.id.ll_data); + iv_book_icon = findViewById(R.id.iv_book_icon); + tv_book_name = findViewById(R.id.tv_book_name); + iv_ksyd = findViewById(R.id.iv_ksyd); + ll_data = findViewById(R.id.ll_data); } @Override @@ -49,9 +46,9 @@ public class BookFragment extends BaseNewFragment { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { - if (!TextUtils.isEmpty(BookFragment.this.bookId)) { - FragmentActivity activity = BookFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookFragment.this.bookId, "智慧图书馆"); + if (!TextUtils.isEmpty(bookId)) { + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookId, "智慧图书馆"); return; } ToastUtil.showTextToastDia("还没有阅读过书籍，快去挑选书籍吧！"); @@ -78,18 +75,18 @@ public class BookFragment extends BaseNewFragment { // JSONObject jSONObject = new JSONObject(str); // if (jSONObject.optString("code").equals("0")) { // JSONObject jSONObject2 = new JSONObject(jSONObject.optString("data")); -// BookFragment.this.bookId = jSONObject2.optString("id"); +// bookId = jSONObject2.optString("id"); // JSONObject jSONObject3 = new JSONObject(jSONObject2.optString("coverFile")); -// BookFragment.this.bookurl = jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL); -// BookFragment.this.showName = jSONObject3.optString("showName"); -// BookFragment.this.tv_book_name.setText(BookFragment.this.showName); -// GlideUtils.load(BookFragment.this.getActivity(), BookFragment.this.bookurl, BookFragment.this.iv_book_icon); -// if (!TextUtils.isEmpty(BookFragment.this.showName)) { -// BookFragment.this.iv_ksyd.setVisibility(0); -// BookFragment.this.ll_data.setVisibility(8); +// bookurl = jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL); +// showName = jSONObject3.optString("showName"); +// tv_book_name.setText(showName); +// GlideUtils.load(getActivity(), bookurl, iv_book_icon); +// if (!TextUtils.isEmpty(showName)) { +// iv_ksyd.setVisibility(0); +// ll_data.setVisibility(8); // } else { -// BookFragment.this.iv_ksyd.setVisibility(8); -// BookFragment.this.ll_data.setVisibility(0); +// iv_ksyd.setVisibility(8); +// ll_data.setVisibility(0); // } // } // } catch (Exception e) { diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/BookListFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/BookListFragment.java index 8eb3914..010aae0 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/BookListFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/BookListFragment.java @@ -37,72 +37,72 @@ public class BookListFragment extends BaseNewFragment { @Override protected void initView() { - this.iv_book_icon = findViewById(R.id.iv_book_icon); - this.iv_book_icon1 = findViewById(R.id.iv_book_icon1); - this.iv_book_icon2 = findViewById(R.id.iv_book_icon2); - this.iv_book_icon3 = findViewById(R.id.iv_book_icon3); - this.iv_book_icon4 = findViewById(R.id.iv_book_icon4); - this.ll_data = findViewById(R.id.ll_data); + iv_book_icon = findViewById(R.id.iv_book_icon); + iv_book_icon1 = findViewById(R.id.iv_book_icon1); + iv_book_icon2 = findViewById(R.id.iv_book_icon2); + iv_book_icon3 = findViewById(R.id.iv_book_icon3); + iv_book_icon4 = findViewById(R.id.iv_book_icon4); + ll_data = findViewById(R.id.ll_data); } @Override public void initListener() { super.initListener(); - this.iv_book_icon.setOnClickListener(new View.OnClickListener() { + iv_book_icon.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { try { - FragmentActivity activity = BookListFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookListFragment.this.bookBeans.get(0).getId(), "智慧图书馆"); + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookBeans.get(0).getId(), "智慧图书馆"); } catch (Exception unused) { } } } }); - this.iv_book_icon1.setOnClickListener(new View.OnClickListener() { + iv_book_icon1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { try { - FragmentActivity activity = BookListFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookListFragment.this.bookBeans.get(1).getId(), "智慧图书馆"); + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookBeans.get(1).getId(), "智慧图书馆"); } catch (Exception unused) { } } } }); - this.iv_book_icon2.setOnClickListener(new View.OnClickListener() { + iv_book_icon2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { try { - FragmentActivity activity = BookListFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookListFragment.this.bookBeans.get(2).getId(), "智慧图书馆"); + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookBeans.get(2).getId(), "智慧图书馆"); } catch (Exception unused) { } } } }); - this.iv_book_icon3.setOnClickListener(new View.OnClickListener() { + iv_book_icon3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { try { - FragmentActivity activity = BookListFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookListFragment.this.bookBeans.get(3).getId(), "智慧图书馆"); + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookBeans.get(3).getId(), "智慧图书馆"); } catch (Exception unused) { } } } }); - this.iv_book_icon4.setOnClickListener(new View.OnClickListener() { + iv_book_icon4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { try { - FragmentActivity activity = BookListFragment.this.getActivity(); - Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + BookListFragment.this.bookBeans.get(4).getId(), "智慧图书馆"); + FragmentActivity activity = getActivity(); + Util.downloadClickListener(activity, "com.jxwgb.zhtsg", "com.jxw.home.ui.activitys.BookDetailActivity", "int:jump_type:1#int:book_id:" + bookBeans.get(4).getId(), "智慧图书馆"); } catch (Exception unused) { } } @@ -122,7 +122,7 @@ public class BookListFragment extends BaseNewFragment { private void getwdsz() { // try { -// OkhtttpUtils.getInstance().doGet(getActivity(), Constant.GW_URL + "/rms/api/library/device/book/read/record/list?isReadFinish=&isCollect=1&pageNo=&pageSize=&thirdUserId=", true, new OkhtttpUtils.OkCallback() { // from class: com.jxw.launcher.fragment.BookListFragment.6 +// OkhtttpUtils.getInstance().doGet(getActivity(), Constant.GW_URL + "/rms/api/library/device/book/read/record/list?isReadFinish=&isCollect=1&pageNo=&pageSize=&thirdUserId=", true, new OkhtttpUtils.OkCallback() { // from class: com.jxw.launcher.fragment.6 // @Override // public void onFailure(Exception exc) { // } @@ -130,14 +130,14 @@ public class BookListFragment extends BaseNewFragment { // @Override // public void onResponse(String str) { // try { -// BookListFragment.this.bookBeans.clear(); +// bookBeans.clear(); // JSONObject jSONObject = new JSONObject(str); // if (jSONObject.optString("code").equals("0")) { // JSONArray jSONArray = new JSONObject(jSONObject.optString("data")).getJSONArray("records"); // if (jSONArray != null && jSONArray.length() > 0) { -// BookListFragment.this.ll_data.setVisibility(8); +// ll_data.setVisibility(8); // } else { -// BookListFragment.this.ll_data.setVisibility(0); +// ll_data.setVisibility(0); // } // for (int i = 0; i < jSONArray.length(); i++) { // JSONObject jSONObject2 = new JSONObject(jSONArray.getString(i)); @@ -145,17 +145,17 @@ public class BookListFragment extends BaseNewFragment { // BookBean bookBean = new BookBean(); // bookBean.setId(jSONObject2.optString("id")); // bookBean.setName(jSONObject2.optString("name")); -// BookListFragment.this.bookBeans.add(bookBean); +// bookBeans.add(bookBean); // if (i == 0) { -// GlideUtils.load(BookListFragment.this.getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), BookListFragment.this.iv_book_icon); +// GlideUtils.load(getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), iv_book_icon); // } else if (i == 1) { -// GlideUtils.load(BookListFragment.this.getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), BookListFragment.this.iv_book_icon1); +// GlideUtils.load(getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), iv_book_icon1); // } else if (i == 2) { -// GlideUtils.load(BookListFragment.this.getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), BookListFragment.this.iv_book_icon2); +// GlideUtils.load(getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), iv_book_icon2); // } else if (i == 3) { -// GlideUtils.load(BookListFragment.this.getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), BookListFragment.this.iv_book_icon3); +// GlideUtils.load(getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), iv_book_icon3); // } else if (i == 4) { -// GlideUtils.load(BookListFragment.this.getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), BookListFragment.this.iv_book_icon4); +// GlideUtils.load(getActivity(), jSONObject3.optString(IjkMediaPlayer.OnNativeInvokeListener.ARG_URL), iv_book_icon4); // } // } // } diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/DdyfzFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/DdyfzFragment.java index e91b932..6aea43a 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/DdyfzFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/DdyfzFragment.java @@ -48,63 +48,63 @@ public class DdyfzFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DdyfzFragment.this.hide(); - DdyfzFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - DdyfzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - DdyfzFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - DdyfzFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DdyfzFragment.this.hide(); - DdyfzFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - DdyfzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - DdyfzFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - DdyfzFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DdyfzFragment.this.hide(); - DdyfzFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - DdyfzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - DdyfzFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - DdyfzFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } } diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/DlFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/DlFragment.java index 06e1a11..1ce51dc 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/DlFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/DlFragment.java @@ -12,7 +12,6 @@ import android.widget.TextView; import com.xwad.os.R; import com.xwad.os.jxw.BaseNewFragment; - public class DlFragment extends BaseNewFragment { ImageView iv_tab_dyfx; ImageView iv_tab_jdbk; @@ -49,64 +48,64 @@ public class DlFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DlFragment.this.hide(); - DlFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - DlFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - DlFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - DlFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DlFragment.this.hide(); - DlFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - DlFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - DlFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - DlFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DlFragment.this.hide(); - DlFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - DlFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - DlFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - DlFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/HxFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/HxFragment.java index 6d3a7bd..00d87cc 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/HxFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/HxFragment.java @@ -20,6 +20,7 @@ import com.xwad.os.base.BaseApplication; import com.xwad.os.bean.jxw.ItemsBean; import com.xwad.os.jxw.AssertUtils; import com.xwad.os.jxw.BaseNewFragment; +import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.view.jxw.widget.AppsDialog; import java.io.BufferedReader; @@ -52,21 +53,21 @@ public class HxFragment extends BaseNewFragment { @Override public void convert(BaseViewHolder baseViewHolder, final ItemsBean itemsBean) { RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_root); - ((ImageView) baseViewHolder.getView(R.id.iv_app_icon)).setImageResource(this.mContext.getResources().getIdentifier(itemsBean.getIcon(), "drawable", this.mContext.getPackageName())); + ((ImageView) baseViewHolder.getView(R.id.iv_app_icon)).setImageResource(mContext.getResources().getIdentifier(itemsBean.getIcon(), "drawable", mContext.getPackageName())); ((TextView) baseViewHolder.getView(R.id.tv_app_name)).setText(itemsBean.getText()); - relativeLayout.setTag(this.mContext.getResources().getString(this.mContext.getResources().getIdentifier(itemsBean.getTag(), "string", this.mContext.getPackageName()))); + relativeLayout.setTag(mContext.getResources().getString(mContext.getResources().getIdentifier(itemsBean.getTag(), "string", mContext.getPackageName()))); relativeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (TextUtils.isEmpty(itemsBean.getTag())) { return; } - HxFragment.this.jumpTag(itemsBean, view); + jumpTag(itemsBean, view); } }); } }; - List appList = new ArrayList(); + List appList = new ArrayList<>(); @Override @@ -89,69 +90,69 @@ public class HxFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); - this.rv_apps = findViewById(R.id.rv_apps); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); + rv_apps = findViewById(R.id.rv_apps); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext()); - linearLayoutManager.setOrientation(0); - this.rv_apps.setLayoutManager(linearLayoutManager); - this.rv_apps.setAdapter(this.contentAdapter); + linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + rv_apps.setLayoutManager(linearLayoutManager); + rv_apps.setAdapter(contentAdapter); getMyList(); - this.contentAdapter.setNewData(this.appList); + contentAdapter.setNewData(appList); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HxFragment.this.hide(); - HxFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - HxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - HxFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - HxFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HxFragment.this.hide(); - HxFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - HxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - HxFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - HxFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HxFragment.this.hide(); - HxFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - HxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - HxFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - HxFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); findViewById(R.id.rl_apps).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - AppsDialog appsDialog = new AppsDialog(HxFragment.this.getActivity(), "hx"); + AppsDialog appsDialog = new AppsDialog(getActivity(), "hx"); appsDialog.show(); appsDialog.setOnCallback(new AppsDialog.Callback() { @Override public void onCallback() { - HxFragment.this.getMyList(); - HxFragment.this.contentAdapter.setNewData(HxFragment.this.appList); + getMyList(); + contentAdapter.setNewData(appList); } }); } @@ -159,22 +160,22 @@ public class HxFragment extends BaseNewFragment { } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } public void getMyList() { File fileStreamPath = BaseApplication.getInstance().getFileStreamPath(FILE_NAME); if (fileStreamPath.exists()) { try { - this.appList.clear(); + appList.clear(); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath)); while (true) { String readLine = bufferedReader.readLine(); @@ -185,20 +186,20 @@ public class HxFragment extends BaseNewFragment { itemsBean.setText(readLine.split("\\|")[0]); itemsBean.setIcon(readLine.split("\\|")[1]); itemsBean.setTag(readLine.split("\\|")[2]); - this.appList.add(itemsBean); + appList.add(itemsBean); } bufferedReader.close(); - if (this.appList == null || this.appList.size() != 0) { + if (appList == null || appList.size() != 0) { return; } - this.appList.addAll(getApps()); + appList.addAll(getApps()); return; } catch (IOException e) { e.printStackTrace(); return; } } - this.appList.addAll(getApps()); + appList.addAll(getApps()); } private List getApps() { @@ -210,28 +211,29 @@ public class HxFragment extends BaseNewFragment { public void jumpTag(ItemsBean itemsBean, View view) { String obj = view.getTag().toString(); saveTag(itemsBean); - this.contentAdapter.notifyDataSetChanged(); + contentAdapter.notifyDataSetChanged(); // MyApp.getInstance().mBottomBtnOnClickListener.setContext(getActivity()); // MyApp.getInstance().mBottomBtnOnClickListener.onClick(obj); + OpenApkUtils.getInstance().openJxwApp(obj); } private void saveTag(ItemsBean itemsBean) { int i = 0; while (true) { - if (i >= this.appList.size()) { + if (i >= appList.size()) { break; - } else if (this.appList.get(i).getTag().equals(itemsBean.getTag())) { - this.appList.remove(i); + } else if (appList.get(i).getTag().equals(itemsBean.getTag())) { + appList.remove(i); break; } else { i++; } } - this.appList.add(0, itemsBean); + appList.add(0, itemsBean); try { FileOutputStream fileOutputStream = new FileOutputStream(BaseApplication.getInstance().getFileStreamPath(FILE_NAME), false); - for (int i2 = 0; i2 < this.appList.size() && i2 <= 1; i2++) { - fileOutputStream.write((this.appList.get(i2).getText() + "|" + this.appList.get(i2).getIcon() + "|" + this.appList.get(i2).getTag() + "\n").getBytes()); + for (int i2 = 0; i2 < appList.size() && i2 <= 1; i2++) { + fileOutputStream.write((appList.get(i2).getText() + "|" + appList.get(i2).getIcon() + "|" + appList.get(i2).getTag() + "\n").getBytes()); } fileOutputStream.flush(); fileOutputStream.close(); diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/KxFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/KxFragment.java index 04f160e..207e5f5 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/KxFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/KxFragment.java @@ -48,64 +48,64 @@ public class KxFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - KxFragment.this.hide(); - KxFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - KxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - KxFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - KxFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - KxFragment.this.hide(); - KxFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - KxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - KxFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - KxFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - KxFragment.this.hide(); - KxFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - KxFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - KxFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - KxFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/LsFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/LsFragment.java index b4af349..13a2ed7 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/LsFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/LsFragment.java @@ -12,7 +12,6 @@ import android.widget.TextView; import com.xwad.os.R; import com.xwad.os.jxw.BaseNewFragment; - public class LsFragment extends BaseNewFragment { ImageView iv_tab_dyfx; ImageView iv_tab_jdbk; @@ -49,64 +48,64 @@ public class LsFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LsFragment.this.hide(); - LsFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - LsFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - LsFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - LsFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LsFragment.this.hide(); - LsFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - LsFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - LsFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - LsFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LsFragment.this.hide(); - LsFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - LsFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - LsFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - LsFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/SwFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/SwFragment.java index 298a687..6c257b5 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/SwFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/SwFragment.java @@ -22,6 +22,7 @@ import com.xwad.os.base.BaseApplication; import com.xwad.os.bean.jxw.ItemsBean; import com.xwad.os.jxw.AssertUtils; import com.xwad.os.jxw.BaseNewFragment; +import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.view.jxw.widget.AppsDialog; import java.io.BufferedReader; @@ -29,10 +30,10 @@ import java.io.File; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; - public class SwFragment extends BaseNewFragment { private static final String FILE_NAME = "app_list_sw"; ImageView iv_tab_dyfx; @@ -49,21 +50,22 @@ public class SwFragment extends BaseNewFragment { TextView tv_tab_dyfx; TextView tv_tab_jdbk; TextView tv_tab_tbjzx; - private BaseQuickAdapter contentAdapter = new BaseQuickAdapter(R.layout.item_wl_app) { + + private BaseQuickAdapter contentAdapter = new BaseQuickAdapter(R.layout.item_wl_app) { @Override public void convert(BaseViewHolder baseViewHolder, final ItemsBean itemsBean) { RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_root); - ((ImageView) baseViewHolder.getView(R.id.iv_app_icon)).setImageResource(this.mContext.getResources().getIdentifier(itemsBean.getIcon(), "drawable", this.mContext.getPackageName())); + ((ImageView) baseViewHolder.getView(R.id.iv_app_icon)).setImageResource(mContext.getResources().getIdentifier(itemsBean.getIcon(), "drawable", mContext.getPackageName())); ((TextView) baseViewHolder.getView(R.id.tv_app_name)).setText(itemsBean.getText()); - relativeLayout.setTag(this.mContext.getResources().getString(this.mContext.getResources().getIdentifier(itemsBean.getTag(), "string", this.mContext.getPackageName()))); + relativeLayout.setTag(mContext.getResources().getString(mContext.getResources().getIdentifier(itemsBean.getTag(), "string", mContext.getPackageName()))); relativeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (TextUtils.isEmpty(itemsBean.getTag())) { return; } - SwFragment.this.jumpTag(itemsBean, view); + jumpTag(itemsBean, view); } }); } @@ -71,89 +73,89 @@ public class SwFragment extends BaseNewFragment { List appList = new ArrayList(); - @Override + @Override public void initListener() { } - @Override + @Override protected void lazyLoad() { } - @Override + @Override protected View createView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) { return layoutInflater.inflate(R.layout.fg_content_sw, viewGroup, false); } - @Override + @Override protected void initView() { initViews(); setListener(); } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); - this.rv_apps = findViewById(R.id.rv_apps); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); + rv_apps = findViewById(R.id.rv_apps); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext()); - linearLayoutManager.setOrientation(0); - this.rv_apps.setLayoutManager(linearLayoutManager); - this.rv_apps.setAdapter(this.contentAdapter); + linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + rv_apps.setLayoutManager(linearLayoutManager); + rv_apps.setAdapter(contentAdapter); getMyList(); - this.contentAdapter.setNewData(this.appList); + contentAdapter.setNewData(appList); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - SwFragment.this.hide(); - SwFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - SwFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - SwFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - SwFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - SwFragment.this.hide(); - SwFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - SwFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - SwFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - SwFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - SwFragment.this.hide(); - SwFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - SwFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - SwFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - SwFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); findViewById(R.id.rl_apps).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - AppsDialog appsDialog = new AppsDialog(SwFragment.this.getActivity(), "sw"); + AppsDialog appsDialog = new AppsDialog(getActivity(), "sw"); appsDialog.show(); appsDialog.setOnCallback(new AppsDialog.Callback() { @Override public void onCallback() { - SwFragment.this.getMyList(); - SwFragment.this.contentAdapter.setNewData(SwFragment.this.appList); + getMyList(); + contentAdapter.setNewData(appList); } }); } @@ -162,15 +164,15 @@ public class SwFragment extends BaseNewFragment { public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } @@ -178,7 +180,7 @@ public class SwFragment extends BaseNewFragment { File fileStreamPath = BaseApplication.getInstance().getFileStreamPath(FILE_NAME); if (fileStreamPath.exists()) { try { - this.appList.clear(); + appList.clear(); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath)); while (true) { String readLine = bufferedReader.readLine(); @@ -189,53 +191,58 @@ public class SwFragment extends BaseNewFragment { itemsBean.setText(readLine.split("\\|")[0]); itemsBean.setIcon(readLine.split("\\|")[1]); itemsBean.setTag(readLine.split("\\|")[2]); - this.appList.add(itemsBean); + appList.add(itemsBean); } bufferedReader.close(); - if (this.appList == null || this.appList.size() != 0) { + if (appList == null || appList.size() != 0) { return; } - this.appList.addAll(getApps()); + appList.addAll(getApps()); return; } catch (IOException e) { e.printStackTrace(); return; } } - this.appList.addAll(getApps()); + appList.addAll(getApps()); } private List getApps() { - return (List) new Gson().fromJson(AssertUtils.getFromAssets(BaseApplication.getInstance(), "script/sw_default_app.json"), new TypeToken>() { - }.getType()); + Gson gson = new Gson(); + String jsonString = AssertUtils.getFromAssets(BaseApplication.getInstance(), "script/sw_default_app.json"); + Type type = new TypeToken>() { + }.getType(); + List itemsBeans = gson.fromJson(jsonString, type); + return itemsBeans; } public void jumpTag(ItemsBean itemsBean, View view) { String obj = view.getTag().toString(); saveTag(itemsBean); - this.contentAdapter.notifyDataSetChanged(); + contentAdapter.notifyDataSetChanged(); // MyApp.getInstance().mBottomBtnOnClickListener.setContext(getActivity()); // MyApp.getInstance().mBottomBtnOnClickListener.onClick(obj); + OpenApkUtils.getInstance().openJxwApp(obj); } private void saveTag(ItemsBean itemsBean) { int i = 0; while (true) { - if (i >= this.appList.size()) { + if (i >= appList.size()) { break; - } else if (this.appList.get(i).getTag().equals(itemsBean.getTag())) { - this.appList.remove(i); + } else if (appList.get(i).getTag().equals(itemsBean.getTag())) { + appList.remove(i); break; } else { i++; } } - this.appList.add(0, itemsBean); + appList.add(0, itemsBean); try { FileOutputStream fileOutputStream = new FileOutputStream(BaseApplication.getInstance().getFileStreamPath(FILE_NAME), false); - for (int i2 = 0; i2 < this.appList.size() && i2 <= 1; i2++) { - fileOutputStream.write((this.appList.get(i2).getText() + "|" + this.appList.get(i2).getIcon() + "|" + this.appList.get(i2).getTag() + "\n").getBytes()); + for (int i2 = 0; i2 < appList.size() && i2 <= 1; i2++) { + fileOutputStream.write((appList.get(i2).getText() + "|" + appList.get(i2).getIcon() + "|" + appList.get(i2).getTag() + "\n").getBytes()); } fileOutputStream.flush(); fileOutputStream.close(); diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/WlFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/WlFragment.java index 3d81400..75e1d80 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/WlFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/WlFragment.java @@ -22,6 +22,7 @@ import com.xwad.os.base.BaseApplication; import com.xwad.os.bean.jxw.ItemsBean; import com.xwad.os.jxw.AssertUtils; import com.xwad.os.jxw.BaseNewFragment; +import com.xwad.os.utils.OpenApkUtils; import com.xwad.os.view.jxw.widget.AppsDialog; import java.io.BufferedReader; @@ -55,7 +56,7 @@ public class WlFragment extends BaseNewFragment { @Override public void convert(BaseViewHolder baseViewHolder, final ItemsBean itemsBean) { RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_root); - ImageView iv_app_icon =baseViewHolder.getView(R.id.iv_app_icon); + ImageView iv_app_icon = baseViewHolder.getView(R.id.iv_app_icon); TextView tv_app_name = baseViewHolder.getView(R.id.tv_app_name); iv_app_icon.setImageResource(mContext.getResources().getIdentifier(itemsBean.getIcon(), "drawable", mContext.getPackageName())); tv_app_name.setText(itemsBean.getText()); @@ -221,6 +222,7 @@ public class WlFragment extends BaseNewFragment { contentAdapter.notifyDataSetChanged(); // MyApp.getInstance().mBottomBtnOnClickListener.setContext(getActivity()); // MyApp.getInstance().mBottomBtnOnClickListener.onClick(obj); + OpenApkUtils.getInstance().openJxwApp(obj); } private void saveTag(ItemsBean itemsBean) { diff --git a/app/src/main/java/com/xwad/os/jxw/fragment/ZzFragment.java b/app/src/main/java/com/xwad/os/jxw/fragment/ZzFragment.java index 6dbd8fd..37fb2a0 100644 --- a/app/src/main/java/com/xwad/os/jxw/fragment/ZzFragment.java +++ b/app/src/main/java/com/xwad/os/jxw/fragment/ZzFragment.java @@ -12,7 +12,6 @@ import android.widget.TextView; import com.xwad.os.R; import com.xwad.os.jxw.BaseNewFragment; - public class ZzFragment extends BaseNewFragment { ImageView iv_tab_dyfx; ImageView iv_tab_jdbk; @@ -28,13 +27,14 @@ public class ZzFragment extends BaseNewFragment { TextView tv_tab_jdbk; TextView tv_tab_tbjzx; - @Override public void initListener() { + } @Override protected void lazyLoad() { + } @Override @@ -49,64 +49,64 @@ public class ZzFragment extends BaseNewFragment { } private void initViews() { - this.ll_zjx = findViewById(R.id.ll_zjx); - this.ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); - this.ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); - this.ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); - this.iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); - this.iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); - this.iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); - this.tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); - this.tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); - this.tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); - this.ll_tbjzx = findViewById(R.id.ll_tbjzx); - this.ll_dyfx = findViewById(R.id.ll_dyfx); - this.rl_jdbk = findViewById(R.id.rl_jdbk); + ll_zjx = findViewById(R.id.ll_zjx); + ll_tab_tbjzx = findViewById(R.id.ll_tab_tbjzx); + ll_tab_dyfx = findViewById(R.id.ll_tab_dyfx); + ll_tab_jdbk = findViewById(R.id.ll_tab_jdbk); + iv_tab_tbjzx = findViewById(R.id.iv_tab_tbjzx); + iv_tab_dyfx = findViewById(R.id.iv_tab_dyfx); + iv_tab_jdbk = findViewById(R.id.iv_tab_jdbk); + tv_tab_tbjzx = findViewById(R.id.tv_tab_tbjzx); + tv_tab_dyfx = findViewById(R.id.tv_tab_dyfx); + tv_tab_jdbk = findViewById(R.id.tv_tab_jdbk); + ll_tbjzx = findViewById(R.id.ll_tbjzx); + ll_dyfx = findViewById(R.id.ll_dyfx); + rl_jdbk = findViewById(R.id.rl_jdbk); } private void setListener() { - this.ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { + ll_tab_tbjzx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ZzFragment.this.hide(); - ZzFragment.this.ll_tbjzx.setVisibility(View.VISIBLE); - ZzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); - ZzFragment.this.tv_tab_tbjzx.setVisibility(View.GONE); - ZzFragment.this.iv_tab_tbjzx.setVisibility(View.VISIBLE); + hide(); + ll_tbjzx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_l); + tv_tab_tbjzx.setVisibility(View.GONE); + iv_tab_tbjzx.setVisibility(View.VISIBLE); } }); - this.ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { + ll_tab_dyfx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ZzFragment.this.hide(); - ZzFragment.this.ll_dyfx.setVisibility(View.VISIBLE); - ZzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); - ZzFragment.this.tv_tab_dyfx.setVisibility(View.GONE); - ZzFragment.this.iv_tab_dyfx.setVisibility(View.VISIBLE); + hide(); + ll_dyfx.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_c); + tv_tab_dyfx.setVisibility(View.GONE); + iv_tab_dyfx.setVisibility(View.VISIBLE); } }); - this.ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { + ll_tab_jdbk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ZzFragment.this.hide(); - ZzFragment.this.rl_jdbk.setVisibility(View.VISIBLE); - ZzFragment.this.ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); - ZzFragment.this.tv_tab_jdbk.setVisibility(View.GONE); - ZzFragment.this.iv_tab_jdbk.setVisibility(View.VISIBLE); + hide(); + rl_jdbk.setVisibility(View.VISIBLE); + ll_zjx.setBackgroundResource(R.drawable.icon_xk_zjx_r); + tv_tab_jdbk.setVisibility(View.GONE); + iv_tab_jdbk.setVisibility(View.VISIBLE); } }); } public void hide() { - this.ll_tbjzx.setVisibility(View.GONE); - this.ll_dyfx.setVisibility(View.GONE); - this.rl_jdbk.setVisibility(View.GONE); - this.tv_tab_tbjzx.setVisibility(View.VISIBLE); - this.tv_tab_dyfx.setVisibility(View.VISIBLE); - this.tv_tab_jdbk.setVisibility(View.VISIBLE); - this.iv_tab_tbjzx.setVisibility(View.INVISIBLE); - this.iv_tab_dyfx.setVisibility(View.INVISIBLE); - this.iv_tab_jdbk.setVisibility(View.INVISIBLE); + ll_tbjzx.setVisibility(View.GONE); + ll_dyfx.setVisibility(View.GONE); + rl_jdbk.setVisibility(View.GONE); + tv_tab_tbjzx.setVisibility(View.VISIBLE); + tv_tab_dyfx.setVisibility(View.VISIBLE); + tv_tab_jdbk.setVisibility(View.VISIBLE); + iv_tab_tbjzx.setVisibility(View.INVISIBLE); + iv_tab_dyfx.setVisibility(View.INVISIBLE); + iv_tab_jdbk.setVisibility(View.INVISIBLE); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/utils/DataUtil.java b/app/src/main/java/com/xwad/os/utils/DataUtil.java new file mode 100644 index 0000000..166f7b8 --- /dev/null +++ b/app/src/main/java/com/xwad/os/utils/DataUtil.java @@ -0,0 +1,45 @@ +package com.xwad.os.utils; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +public class DataUtil { + private static SimpleDateFormat day = new SimpleDateFormat("yyyy/MM/dd"); + private static SimpleDateFormat hour = new SimpleDateFormat("HH:mm"); + private static SimpleDateFormat minute = new SimpleDateFormat("mm"); + + /** + * 格式化日期(精确到天) + */ + public static String formatDateDay() { + return day.format(new Date()); + } + + /** + * 格式化日期(hour) + */ + public static String formatDateHour() { + return hour.format(new Date()); + } + + /** + * 格式化日期(minute) + */ + public static String formatDateMinute() { + return minute.format(new Date()); + } + + // 根据日期取得星期几 + public static String getWeek(Date date) { + String[] weeks = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + int week_index = cal.get(Calendar.DAY_OF_WEEK) - 1; + if (week_index < 0) { + week_index = 0; + } + return weeks[week_index]; + } + +} diff --git a/app/src/main/java/com/xwad/os/view/jxw/util/CircleImageView.java b/app/src/main/java/com/xwad/os/view/jxw/util/CircleImageView.java index 3da1029..31b73f4 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/util/CircleImageView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/util/CircleImageView.java @@ -25,8 +25,7 @@ import android.widget.ImageView; import com.xwad.os.R; - -public class CircleImageView extends ImageView { +public class CircleImageView extends androidx.appcompat.widget.AppCompatImageView { private static final int COLORDRAWABLE_DIMENSION = 2; private static final int DEFAULT_BORDER_COLOR = -16777216; private static final boolean DEFAULT_BORDER_OVERLAY = false; @@ -59,15 +58,15 @@ public class CircleImageView extends ImageView { public CircleImageView(Context context) { super(context); - this.mDrawableRect = new RectF(); - this.mBorderRect = new RectF(); - this.mShaderMatrix = new Matrix(); - this.mBitmapPaint = new Paint(); - this.mBorderPaint = new Paint(); - this.mCircleBackgroundPaint = new Paint(); - this.mBorderColor = DEFAULT_BORDER_COLOR; - this.mBorderWidth = DEFAULT_BORDER_WIDTH; - this.mCircleBackgroundColor = DEFAULT_CIRCLE_BACKGROUND_COLOR; + mDrawableRect = new RectF(); + mBorderRect = new RectF(); + mShaderMatrix = new Matrix(); + mBitmapPaint = new Paint(); + mBorderPaint = new Paint(); + mCircleBackgroundPaint = new Paint(); + mBorderColor = DEFAULT_BORDER_COLOR; + mBorderWidth = DEFAULT_BORDER_WIDTH; + mCircleBackgroundColor = DEFAULT_CIRCLE_BACKGROUND_COLOR; init(); } @@ -77,32 +76,32 @@ public class CircleImageView extends ImageView { public CircleImageView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.mDrawableRect = new RectF(); - this.mBorderRect = new RectF(); - this.mShaderMatrix = new Matrix(); - this.mBitmapPaint = new Paint(); - this.mBorderPaint = new Paint(); - this.mCircleBackgroundPaint = new Paint(); - this.mBorderColor = DEFAULT_BORDER_COLOR; - this.mBorderWidth = DEFAULT_BORDER_WIDTH; - this.mCircleBackgroundColor = DEFAULT_CIRCLE_BACKGROUND_COLOR; + mDrawableRect = new RectF(); + mBorderRect = new RectF(); + mShaderMatrix = new Matrix(); + mBitmapPaint = new Paint(); + mBorderPaint = new Paint(); + mCircleBackgroundPaint = new Paint(); + mBorderColor = DEFAULT_BORDER_COLOR; + mBorderWidth = DEFAULT_BORDER_WIDTH; + mCircleBackgroundColor = DEFAULT_CIRCLE_BACKGROUND_COLOR; // 优化TypedArray属性获取，使用常量索引替代硬编码 TypedArray obtainStyledAttributes = context.obtainStyledAttributes( attributeSet, R.styleable.CircleImageView, i, 0); - this.mBorderWidth = obtainStyledAttributes.getDimensionPixelSize( + mBorderWidth = obtainStyledAttributes.getDimensionPixelSize( R.styleable.CircleImageView_civ_border_width, DEFAULT_BORDER_WIDTH); - this.mBorderColor = obtainStyledAttributes.getColor( + mBorderColor = obtainStyledAttributes.getColor( R.styleable.CircleImageView_civ_border_color, DEFAULT_BORDER_COLOR); - this.mBorderOverlay = obtainStyledAttributes.getBoolean( + mBorderOverlay = obtainStyledAttributes.getBoolean( R.styleable.CircleImageView_civ_border_overlay, DEFAULT_BORDER_OVERLAY); // 优先使用civ_circle_background_color，兼容旧属性civ_fill_color if (obtainStyledAttributes.hasValue(R.styleable.CircleImageView_civ_circle_background_color)) { - this.mCircleBackgroundColor = obtainStyledAttributes.getColor( + mCircleBackgroundColor = obtainStyledAttributes.getColor( R.styleable.CircleImageView_civ_circle_background_color, DEFAULT_CIRCLE_BACKGROUND_COLOR); } else if (obtainStyledAttributes.hasValue(R.styleable.CircleImageView_civ_fill_color)) { - this.mCircleBackgroundColor = obtainStyledAttributes.getColor( + mCircleBackgroundColor = obtainStyledAttributes.getColor( R.styleable.CircleImageView_civ_fill_color, DEFAULT_CIRCLE_BACKGROUND_COLOR); } obtainStyledAttributes.recycle(); @@ -112,13 +111,13 @@ public class CircleImageView extends ImageView { private void init() { super.setScaleType(SCALE_TYPE); - this.mReady = true; + mReady = true; if (Build.VERSION.SDK_INT >= 21) { setOutlineProvider(new OutlineProvider()); } - if (this.mSetupPending) { + if (mSetupPending) { setup(); - this.mSetupPending = false; + mSetupPending = false; } } @@ -143,16 +142,16 @@ public class CircleImageView extends ImageView { @Override protected void onDraw(Canvas canvas) { - if (this.mDisableCircularTransformation) { + if (mDisableCircularTransformation) { super.onDraw(canvas); - } else if (this.mBitmap == null) { + } else if (mBitmap == null) { } else { - if (this.mCircleBackgroundColor != 0) { - canvas.drawCircle(this.mDrawableRect.centerX(), this.mDrawableRect.centerY(), this.mDrawableRadius, this.mCircleBackgroundPaint); + if (mCircleBackgroundColor != 0) { + canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mCircleBackgroundPaint); } - canvas.drawCircle(this.mDrawableRect.centerX(), this.mDrawableRect.centerY(), this.mDrawableRadius, this.mBitmapPaint); - if (this.mBorderWidth > 0) { - canvas.drawCircle(this.mBorderRect.centerX(), this.mBorderRect.centerY(), this.mBorderRadius, this.mBorderPaint); + canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mBitmapPaint); + if (mBorderWidth > 0) { + canvas.drawCircle(mBorderRect.centerX(), mBorderRect.centerY(), mBorderRadius, mBorderPaint); } } } @@ -176,15 +175,15 @@ public class CircleImageView extends ImageView { } public int getBorderColor() { - return this.mBorderColor; + return mBorderColor; } public void setBorderColor(int i) { - if (i == this.mBorderColor) { + if (i == mBorderColor) { return; } - this.mBorderColor = i; - this.mBorderPaint.setColor(this.mBorderColor); + mBorderColor = i; + mBorderPaint.setColor(mBorderColor); invalidate(); } @@ -194,15 +193,15 @@ public class CircleImageView extends ImageView { } public int getCircleBackgroundColor() { - return this.mCircleBackgroundColor; + return mCircleBackgroundColor; } public void setCircleBackgroundColor(int i) { - if (i == this.mCircleBackgroundColor) { + if (i == mCircleBackgroundColor) { return; } - this.mCircleBackgroundColor = i; - this.mCircleBackgroundPaint.setColor(i); + mCircleBackgroundColor = i; + mCircleBackgroundPaint.setColor(i); invalidate(); } @@ -226,38 +225,38 @@ public class CircleImageView extends ImageView { } public int getBorderWidth() { - return this.mBorderWidth; + return mBorderWidth; } public void setBorderWidth(int i) { - if (i == this.mBorderWidth) { + if (i == mBorderWidth) { return; } - this.mBorderWidth = i; + mBorderWidth = i; setup(); } public boolean isBorderOverlay() { - return this.mBorderOverlay; + return mBorderOverlay; } public void setBorderOverlay(boolean z) { - if (z == this.mBorderOverlay) { + if (z == mBorderOverlay) { return; } - this.mBorderOverlay = z; + mBorderOverlay = z; setup(); } public boolean isDisableCircularTransformation() { - return this.mDisableCircularTransformation; + return mDisableCircularTransformation; } public void setDisableCircularTransformation(boolean z) { - if (this.mDisableCircularTransformation == z) { + if (mDisableCircularTransformation == z) { return; } - this.mDisableCircularTransformation = z; + mDisableCircularTransformation = z; initializeBitmap(); } @@ -287,23 +286,23 @@ public class CircleImageView extends ImageView { @Override public void setColorFilter(ColorFilter colorFilter) { - if (colorFilter == this.mColorFilter) { + if (colorFilter == mColorFilter) { return; } - this.mColorFilter = colorFilter; + mColorFilter = colorFilter; applyColorFilter(); invalidate(); } @Override public ColorFilter getColorFilter() { - return this.mColorFilter; + return mColorFilter; } private void applyColorFilter() { - Paint paint = this.mBitmapPaint; + Paint paint = mBitmapPaint; if (paint != null) { - paint.setColorFilter(this.mColorFilter); + paint.setColorFilter(mColorFilter); } } @@ -332,44 +331,44 @@ public class CircleImageView extends ImageView { } private void initializeBitmap() { - if (this.mDisableCircularTransformation) { - this.mBitmap = null; + if (mDisableCircularTransformation) { + mBitmap = null; } else { - this.mBitmap = getBitmapFromDrawable(getDrawable()); + mBitmap = getBitmapFromDrawable(getDrawable()); } setup(); } private void setup() { int i; - if (!this.mReady) { - this.mSetupPending = true; + if (!mReady) { + mSetupPending = true; } else if (getWidth() == 0 && getHeight() == 0) { } else { - Bitmap bitmap = this.mBitmap; + Bitmap bitmap = mBitmap; if (bitmap == null) { invalidate(); return; } - this.mBitmapShader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); - this.mBitmapPaint.setAntiAlias(true); - this.mBitmapPaint.setShader(this.mBitmapShader); - this.mBorderPaint.setStyle(Paint.Style.STROKE); - this.mBorderPaint.setAntiAlias(true); - this.mBorderPaint.setColor(this.mBorderColor); - this.mBorderPaint.setStrokeWidth(this.mBorderWidth); - this.mCircleBackgroundPaint.setStyle(Paint.Style.FILL); - this.mCircleBackgroundPaint.setAntiAlias(true); - this.mCircleBackgroundPaint.setColor(this.mCircleBackgroundColor); - this.mBitmapHeight = this.mBitmap.getHeight(); - this.mBitmapWidth = this.mBitmap.getWidth(); - this.mBorderRect.set(calculateBounds()); - this.mBorderRadius = Math.min((this.mBorderRect.height() - this.mBorderWidth) / 2.0f, (this.mBorderRect.width() - this.mBorderWidth) / 2.0f); - this.mDrawableRect.set(this.mBorderRect); - if (!this.mBorderOverlay && (i = this.mBorderWidth) > 0) { - this.mDrawableRect.inset(i - 1.0f, i - 1.0f); + mBitmapShader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); + mBitmapPaint.setAntiAlias(true); + mBitmapPaint.setShader(mBitmapShader); + mBorderPaint.setStyle(Paint.Style.STROKE); + mBorderPaint.setAntiAlias(true); + mBorderPaint.setColor(mBorderColor); + mBorderPaint.setStrokeWidth(mBorderWidth); + mCircleBackgroundPaint.setStyle(Paint.Style.FILL); + mCircleBackgroundPaint.setAntiAlias(true); + mCircleBackgroundPaint.setColor(mCircleBackgroundColor); + mBitmapHeight = mBitmap.getHeight(); + mBitmapWidth = mBitmap.getWidth(); + mBorderRect.set(calculateBounds()); + mBorderRadius = Math.min((mBorderRect.height() - mBorderWidth) / 2.0f, (mBorderRect.width() - mBorderWidth) / 2.0f); + mDrawableRect.set(mBorderRect); + if (!mBorderOverlay && (i = mBorderWidth) > 0) { + mDrawableRect.inset(i - 1.0f, i - 1.0f); } - this.mDrawableRadius = Math.min(this.mDrawableRect.height() / 2.0f, this.mDrawableRect.width() / 2.0f); + mDrawableRadius = Math.min(mDrawableRect.height() / 2.0f, mDrawableRect.width() / 2.0f); applyColorFilter(); updateShaderMatrix(); invalidate(); @@ -429,7 +428,7 @@ public class CircleImageView extends ImageView { @Override public void getOutline(View view, Outline outline) { Rect rect = new Rect(); - CircleImageView.this.mBorderRect.roundOut(rect); + mBorderRect.roundOut(rect); outline.setRoundRect(rect, rect.width() / 2.0f); } } diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/JxwBatteryCircular.java b/app/src/main/java/com/xwad/os/view/jxw/view/JxwBatteryCircular.java index 60bc63b..a3afbb1 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/view/JxwBatteryCircular.java +++ b/app/src/main/java/com/xwad/os/view/jxw/view/JxwBatteryCircular.java @@ -13,10 +13,9 @@ import android.graphics.Typeface; import android.os.Looper; import android.util.AttributeSet; import android.view.View; -import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; + import com.xwad.os.R; -/* loaded from: classes2.dex */ public class JxwBatteryCircular extends View { private ValueAnimator animator; float bottom; @@ -50,12 +49,8 @@ public class JxwBatteryCircular extends View { float top; float total; private int width; - - /* renamed from: x */ - int f225x; - - /* renamed from: y */ - int f226y; + int x; + int y; public JxwBatteryCircular(Context context) { this(context, null); @@ -67,83 +62,83 @@ public class JxwBatteryCircular extends View { public JxwBatteryCircular(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.colorE21E1E = Color.parseColor("#FF0000"); - this.mOuterRectF = new RectF(); - this.quantity = 29; - this.mProgressRectF = new RectF(); - this.mClipRectF = new RectF(); - this.mClickProgressPath = new Path(); - this.isSquare = false; - this.lowBatteryThreshold = 30; - this.mPaint = new Paint(); - this.bounds = new Rect(); - float f = this.mMargin; - this.total = (((this.width + (f * 3.0f)) - (f * 3.0f)) - (this.mMiddleWidth * 2.0f)) - (this.mOuterStrokeWidth * 4.0f); - this.power_percent = (this.isCharging ? this.chargingQuantity : this.quantity) / 100.0f; - float f2 = this.mOuterStrokeWidth; - float f3 = this.mMiddleWidth; - this.left = f2 + 0.0f + f3; - this.top = 0.0f + f2 + f3; - this.right = (this.mMargin + f2 + f3 + this.total) * this.power_percent; - this.bottom = ((this.height - 0) - f2) - f3; + colorE21E1E = Color.parseColor("#FF0000"); + mOuterRectF = new RectF(); + quantity = 29; + mProgressRectF = new RectF(); + mClipRectF = new RectF(); + mClickProgressPath = new Path(); + isSquare = false; + lowBatteryThreshold = 30; + mPaint = new Paint(); + bounds = new Rect(); + float f = mMargin; + total = (((width + (f * 3.0f)) - (f * 3.0f)) - (mMiddleWidth * 2.0f)) - (mOuterStrokeWidth * 4.0f); + power_percent = (isCharging ? chargingQuantity : quantity) / 100.0f; + float f2 = mOuterStrokeWidth; + float f3 = mMiddleWidth; + left = f2 + 0.0f + f3; + top = 0.0f + f2 + f3; + right = (mMargin + f2 + f3 + total) * power_percent; + bottom = ((height) - f2) - f3; initParameter(); initAllPaints(); initAnimator(); } private void initAnimator() { - this.animator = ValueAnimator.ofInt(0, 100); - this.animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { // from class: com.jxw.launcher.view.JxwBatteryCircular.1 - @Override // android.animation.ValueAnimator.AnimatorUpdateListener + animator = ValueAnimator.ofInt(0, 100); + animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override public void onAnimationUpdate(ValueAnimator valueAnimator) { - JxwBatteryCircular.this.chargingQuantity = ((Integer) valueAnimator.getAnimatedValue()).intValue(); - JxwBatteryCircular.this.invalidateView(); + chargingQuantity = (Integer) valueAnimator.getAnimatedValue(); + invalidateView(); } }); - this.animator.setRepeatCount(-1); - this.animator.setDuration(AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS); - this.animator.start(); + animator.setRepeatCount(-1); + animator.setDuration(2000); + animator.start(); } private void initParameter() { - this.colorBCBCBE = 2013265919; - this.mUnitStrokeWidth = getResources().getDimension(R.dimen.x2); - this.mOuterStrokeWidth = getResources().getDimension(R.dimen.x2); - this.mBatteryHeadMargin = getResources().getDimension(R.dimen.x2); - this.mMargin = getResources().getDimension(R.dimen.x2); - this.mMiddleWidth = getResources().getDimension(R.dimen.x2); + colorBCBCBE = 2013265919; + mUnitStrokeWidth = getResources().getDimension(R.dimen.x2); + mOuterStrokeWidth = getResources().getDimension(R.dimen.x2); + mBatteryHeadMargin = getResources().getDimension(R.dimen.x2); + mMargin = getResources().getDimension(R.dimen.x2); + mMiddleWidth = getResources().getDimension(R.dimen.x2); } private void initAllPaints() { - this.mOuterPaint = new Paint(1); - this.mOuterPaint.setDither(true); - this.mOuterPaint.setAntiAlias(true); - this.mOuterPaint.setColor(-1); - this.mProgressPaint = new Paint(1); - this.mProgressPaint.setDither(true); - this.mProgressPaint.setAntiAlias(true); - this.mProgressPaint.setColor(-1); - this.mProgressPaint.setStrokeWidth(this.mUnitStrokeWidth); - this.mProgressPaint.setStyle(Paint.Style.FILL_AND_STROKE); - this.mChargingBitmapPaint = new Paint(); - this.mChargingBitmapPaint.setDither(true); - this.mChargingBitmapPaint.setAntiAlias(true); - this.mChargingBitmapPaint.setFilterBitmap(true); + mOuterPaint = new Paint(1); + mOuterPaint.setDither(true); + mOuterPaint.setAntiAlias(true); + mOuterPaint.setColor(-1); + mProgressPaint = new Paint(1); + mProgressPaint.setDither(true); + mProgressPaint.setAntiAlias(true); + mProgressPaint.setColor(-1); + mProgressPaint.setStrokeWidth(mUnitStrokeWidth); + mProgressPaint.setStyle(Paint.Style.FILL_AND_STROKE); + mChargingBitmapPaint = new Paint(); + mChargingBitmapPaint.setDither(true); + mChargingBitmapPaint.setAntiAlias(true); + mChargingBitmapPaint.setFilterBitmap(true); } - @Override // android.view.View + @Override protected void onMeasure(int i, int i2) { super.onMeasure(i, i2); - this.width = getMeasuredWidth(); - this.height = getMeasuredHeight(); - int i3 = this.height; - this.mOuterRound = i3 / 2.0f; - float f = this.mMargin; - this.mProgressRadius = ((i3 - (f * 2.0f)) - (this.mOuterStrokeWidth * 2.0f)) / 2.0f; - this.mOuterRectF.set(f, f, (this.width - f) - this.mBatteryHeadMargin, i3 - f); + width = getMeasuredWidth(); + height = getMeasuredHeight(); + int i3 = height; + mOuterRound = i3 / 2.0f; + float f = mMargin; + mProgressRadius = ((i3 - (f * 2.0f)) - (mOuterStrokeWidth * 2.0f)) / 2.0f; + mOuterRectF.set(f, f, (width - f) - mBatteryHeadMargin, i3 - f); } - @Override // android.view.View + @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); onOuterDraw(canvas); @@ -151,98 +146,97 @@ public class JxwBatteryCircular extends View { } private void onOuterDraw(Canvas canvas) { - this.mOuterPaint.setStrokeWidth(this.mOuterStrokeWidth); - this.mOuterPaint.setStyle(Paint.Style.STROKE); - if (this.isSquare) { - canvas.drawRect(this.mOuterRectF, this.mOuterPaint); + mOuterPaint.setStrokeWidth(mOuterStrokeWidth); + mOuterPaint.setStyle(Paint.Style.STROKE); + if (isSquare) { + canvas.drawRect(mOuterRectF, mOuterPaint); } else { - RectF rectF = this.mOuterRectF; - float f = this.mOuterRound; - canvas.drawRoundRect(rectF, f, f, this.mOuterPaint); + RectF rectF = mOuterRectF; + float f = mOuterRound; + canvas.drawRoundRect(rectF, f, f, mOuterPaint); } - this.mOuterPaint.setStrokeWidth(this.mUnitStrokeWidth); - this.mOuterPaint.setStyle(Paint.Style.FILL_AND_STROKE); - this.mOuterPaint.setAntiAlias(true); - this.mPaint.setTypeface(Typeface.create(Typeface.DEFAULT_BOLD, 1)); - this.mPaint.setTextSize(getResources().getDimension(R.dimen.x20)); - this.mPaint.setColor(-1); - this.mPaint.setAntiAlias(true); - this.mPaint.getTextBounds(String.valueOf(this.quantity), 0, String.valueOf(this.quantity).length(), this.bounds); - Paint.FontMetricsInt fontMetricsInt = this.mPaint.getFontMetricsInt(); - this.f225x = (getMeasuredWidth() / 2) - (this.bounds.width() / 2); - this.f226y = (((getMeasuredHeight() - fontMetricsInt.bottom) + fontMetricsInt.top) / 2) - fontMetricsInt.top; + mOuterPaint.setStrokeWidth(mUnitStrokeWidth); + mOuterPaint.setStyle(Paint.Style.FILL_AND_STROKE); + mOuterPaint.setAntiAlias(true); + mPaint.setTypeface(Typeface.create(Typeface.DEFAULT_BOLD, 1)); + mPaint.setTextSize(getResources().getDimension(R.dimen.x20)); + mPaint.setColor(-1); + mPaint.setAntiAlias(true); + mPaint.getTextBounds(String.valueOf(quantity), 0, String.valueOf(quantity).length(), bounds); + Paint.FontMetricsInt fontMetricsInt = mPaint.getFontMetricsInt(); + x = (getMeasuredWidth() / 2) - (bounds.width() / 2); + y = (((getMeasuredHeight() - fontMetricsInt.bottom) + fontMetricsInt.top) / 2) - fontMetricsInt.top; canvas.setDrawFilter(new PaintFlagsDrawFilter(0, 3)); - canvas.drawText(String.valueOf(this.quantity), this.f225x - getResources().getDimension(R.dimen.x1), this.f226y, this.mPaint); + canvas.drawText(String.valueOf(quantity), x - getResources().getDimension(R.dimen.x1), y, mPaint); } private void onProgressDraw(Canvas canvas) { - if (!this.isCharging) { - if (this.quantity > this.lowBatteryThreshold) { - this.mProgressPaint.setColor(this.colorBCBCBE); + if (!isCharging) { + if (quantity > lowBatteryThreshold) { + mProgressPaint.setColor(colorBCBCBE); } else { - this.mProgressPaint.setColor(this.colorE21E1E); + mProgressPaint.setColor(colorE21E1E); } } else { - this.mProgressPaint.setColor(this.colorBCBCBE); + mProgressPaint.setColor(colorBCBCBE); } - float f = this.mMargin; - this.total = (((this.width + (f * 3.0f)) - (f * 3.0f)) - (this.mMiddleWidth * 2.0f)) - (this.mOuterStrokeWidth * 4.0f); - this.power_percent = (this.isCharging ? this.chargingQuantity : this.quantity) / 100.0f; - float f2 = this.mOuterStrokeWidth; - float f3 = this.mMiddleWidth; - this.left = f2 + 0.0f + f3; - this.top = 0.0f + f2 + f3; - this.right = (this.mMargin + f2 + f3 + this.total) * this.power_percent; - this.bottom = ((this.height + 0) - f2) - f3; - this.mProgressRectF.set(this.left, this.top, this.right, this.bottom); - this.mClipRectF.set(this.left, this.top, this.mMargin + this.mOuterStrokeWidth + this.mMiddleWidth + this.total, this.bottom); - this.mClickProgressPath.reset(); - Path path = this.mClickProgressPath; - RectF rectF = this.mClipRectF; - float f4 = this.mProgressRadius; + float f = mMargin; + total = (((width + (f * 3.0f)) - (f * 3.0f)) - (mMiddleWidth * 2.0f)) - (mOuterStrokeWidth * 4.0f); + power_percent = (isCharging ? chargingQuantity : quantity) / 100.0f; + float f2 = mOuterStrokeWidth; + float f3 = mMiddleWidth; + left = f2 + 0.0f + f3; + top = 0.0f + f2 + f3; + right = (mMargin + f2 + f3 + total) * power_percent; + bottom = ((height) - f2) - f3; + mProgressRectF.set(left, top, right, bottom); + mClipRectF.set(left, top, mMargin + mOuterStrokeWidth + mMiddleWidth + total, bottom); + mClickProgressPath.reset(); + Path path = mClickProgressPath; + RectF rectF = mClipRectF; + float f4 = mProgressRadius; path.addRoundRect(rectF, f4, f4, Path.Direction.CCW); - if (this.isSquare) { - canvas.drawRect(this.mProgressRectF, this.mProgressPaint); + if (isSquare) { + canvas.drawRect(mProgressRectF, mProgressPaint); return; } - canvas.clipPath(this.mClickProgressPath); - RectF rectF2 = this.mProgressRectF; - float f5 = this.mProgressRadius; - canvas.drawRoundRect(rectF2, f5, f5, this.mProgressPaint); + canvas.clipPath(mClickProgressPath); + RectF rectF2 = mProgressRectF; + float f5 = mProgressRadius; + canvas.drawRoundRect(rectF2, f5, f5, mProgressPaint); } - public void setPower(int i, boolean z) { - this.quantity = i; - this.isCharging = z; + public void setPower(int i, boolean charging) { + quantity = i; + isCharging = charging; checkQuantity(); - if (this.isCharging) { - if (this.animator.isRunning() || this.animator.isStarted()) { + if (isCharging) { + if (animator.isRunning() || animator.isStarted()) { return; } - this.animator.start(); + animator.start(); return; } - if (this.animator.isStarted() || this.animator.isRunning()) { - this.animator.cancel(); + if (animator.isStarted() || animator.isRunning()) { + animator.cancel(); } invalidateView(); } private void checkQuantity() { - int i = this.quantity; + int i = quantity; if (i < 0) { - this.quantity = 0; + quantity = 0; } else if (i > 100) { - this.quantity = 100; + quantity = 100; } } - @Override // android.view.View + @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); } - public void invalidateView() { if (Looper.getMainLooper() == Looper.myLooper()) { invalidate(); diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/TypefaceTextView.java b/app/src/main/java/com/xwad/os/view/jxw/view/TypefaceTextView.java index 0de410b..a77e2ec 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/view/TypefaceTextView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/view/TypefaceTextView.java @@ -33,12 +33,12 @@ public class TypefaceTextView extends AppCompatTextView implements Checkable { public TypefaceTextView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.fontName = context.obtainStyledAttributes(attributeSet, R.styleable.TypefaceTextView, i, 0).getString(R.styleable.TypefaceTextView_typeface); + fontName = context.obtainStyledAttributes(attributeSet, R.styleable.TypefaceTextView, i, 0).getString(R.styleable.TypefaceTextView_typeface); init(); } public void setTypeface(String str) { - this.fontName = str; + fontName = str; init(); } @@ -46,20 +46,21 @@ public class TypefaceTextView extends AppCompatTextView implements Checkable { String[] enablePath; try { if (XXPermissions.isGranted(BaseApplication.getInstance(), Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE)) { - if (!TextUtils.isEmpty(this.fontName) - && (enablePath = FixDataPathUtils.getEnablePath(BaseApplication.getInstance(), this.fontName)) != null + if (!TextUtils.isEmpty(fontName) + && (enablePath = FixDataPathUtils.getEnablePath(BaseApplication.getInstance(), fontName)) != null && enablePath.length > 0 && !TextUtils.isEmpty(enablePath[0])) { - if (typefaceMap.get(this.fontName) != null) { - setTypeface(typefaceMap.get(this.fontName)); + if (typefaceMap.get(fontName) != null) { + setTypeface(typefaceMap.get(fontName)); } else { Typeface createFromFile = Typeface.createFromFile(enablePath[0]); setTypeface(createFromFile); - typefaceMap.put(this.fontName, createFromFile); + typefaceMap.put(fontName, createFromFile); } } setIncludeFontPadding(false); } - } catch (Exception unused) { + } catch (Exception ignored) { + } } @@ -74,17 +75,17 @@ public class TypefaceTextView extends AppCompatTextView implements Checkable { @Override public void setChecked(boolean z) { - this.mChecked = z; + mChecked = z; refreshDrawableState(); } @Override public boolean isChecked() { - return this.mChecked; + return mChecked; } @Override public void toggle() { - this.mChecked = !this.mChecked; + mChecked = !mChecked; } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/VerticalProgressBar.java b/app/src/main/java/com/xwad/os/view/jxw/view/VerticalProgressBar.java index ac7d739..c921f46 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/view/VerticalProgressBar.java +++ b/app/src/main/java/com/xwad/os/view/jxw/view/VerticalProgressBar.java @@ -18,57 +18,57 @@ public class VerticalProgressBar extends View { public VerticalProgressBar(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.minute = 0; + minute = 0; init(); } public VerticalProgressBar(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.minute = 0; + minute = 0; init(); } private void init() { - this.progress = 0; - this.maxProgress = 100; - this.progressColor = -9055101; - this.paint = new Paint(); - this.paint.setColor(this.progressColor); - this.paint.setStyle(Paint.Style.FILL); - this.paint.setAntiAlias(true); - this.mPaint = new Paint(); - this.mPaint.setColor(-1); - this.mPaint.setAntiAlias(true); - this.mPaint.setTextSize(getResources().getDimension(R.dimen.x18)); - this.mPaint.setTextAlign(Paint.Align.CENTER); + progress = 0; + maxProgress = 100; + progressColor = -9055101; + paint = new Paint(); + paint.setColor(progressColor); + paint.setStyle(Paint.Style.FILL); + paint.setAntiAlias(true); + mPaint = new Paint(); + mPaint.setColor(-1); + mPaint.setAntiAlias(true); + mPaint.setTextSize(getResources().getDimension(R.dimen.x18)); + mPaint.setTextAlign(Paint.Align.CENTER); } public void setProgress(int i) { - this.progress = i; + progress = i; invalidate(); } public void setMaxProgress(int i) { - this.maxProgress = i; + maxProgress = i; } public void setProgressColor(int i) { - this.progressColor = i; - this.paint.setColor(i); + progressColor = i; + paint.setColor(i); invalidate(); } public void setText(int i) { - this.minute = i; + minute = i; invalidate(); } @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - float height = ((int) (getHeight() - getResources().getDimension(R.dimen.x25))) * (this.progress / this.maxProgress); - canvas.drawRect(0.0f, getHeight() - height, getWidth(), getHeight(), this.paint); - canvas.drawText(this.progress + "分钟", getWidth() / 2.0f, (getHeight() - height) - getResources().getDimension(R.dimen.x10), this.mPaint); + float height = ((int) (getHeight() - getResources().getDimension(R.dimen.x25))) * (progress / maxProgress); + canvas.drawRect(0.0f, getHeight() - height, getWidth(), getHeight(), paint); + canvas.drawText(progress + "分钟", getWidth() / 2.0f, (getHeight() - height) - getResources().getDimension(R.dimen.x10), mPaint); } @Override diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/dialog/LockDialog.java b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/LockDialog.java new file mode 100644 index 0000000..261b5e1 --- /dev/null +++ b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/LockDialog.java @@ -0,0 +1,97 @@ +package com.xwad.os.view.jxw.view.dialog; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; +import android.graphics.Point; +import android.os.Bundle; +import android.os.CountDownTimer; +import android.view.Display; +import android.view.View; +import android.view.WindowManager; +import android.widget.TextView; + +import com.xwad.os.R; + +public class LockDialog extends Dialog { + private Activity activity; + private TextView tv_confirm; + private TextView tv_title; + + private String appName; + + private Callback mCallback; + + public interface Callback { + void onCallback(String str); + } + + public LockDialog(Context context, String str) { + super(context, R.style.ActionSheetDialogStyle); + activity = (Activity) context; + appName = str; + } + + @Override + protected void onCreate(Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.dialog_lock); + WindowManager windowManager = getWindow().getWindowManager(); + getWindow().setBackgroundDrawableResource(17170445); + Display defaultDisplay = windowManager.getDefaultDisplay(); + WindowManager.LayoutParams attributes = getWindow().getAttributes(); + Point point = new Point(); + defaultDisplay.getSize(point); + double d = point.x; + Double.isNaN(d); + attributes.width = (int) (d * 0.8d); + getWindow().setAttributes(attributes); + setCanceledOnTouchOutside(true); + setCancelable(true); + getWindow().setDimAmount(0.3f); + initView(); + } + + private void initView() { + tv_title = findViewById(R.id.tv_title); + tv_confirm = findViewById(R.id.tv_confirm); + TextView textView = tv_title; + textView.setText("【" + appName + "】已被禁用，需要爸爸妈妈允许后才可恢复使用哦。"); + new MyCountDownTimer(3000L, 1000L) { + @Override + public void onFinish() { + dismiss(); + } + + @Override + public void onTick(long j) { + TextView textView2 = tv_confirm; + textView2.setText("知道了(" + ((j + 1000) / 1000) + ")"); + } + }.start(); + tv_confirm.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dismiss(); + } + }); + } + + public void setOnCallback(Callback callback) { + mCallback = callback; + } + + static class MyCountDownTimer extends CountDownTimer { + @Override + public void onFinish() { + } + + @Override + public void onTick(long j) { + } + + MyCountDownTimer(long j, long j2) { + super(j, j2); + } + } +} diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/dialog/QhbzDialog.java b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/QhbzDialog.java new file mode 100644 index 0000000..e157a3b --- /dev/null +++ b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/QhbzDialog.java @@ -0,0 +1,108 @@ +package com.xwad.os.view.jxw.view.dialog; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; +import android.graphics.Point; +import android.os.Bundle; +import android.view.Display; +import android.view.View; +import android.view.WindowManager; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.xwad.os.R; +import com.xwad.os.jxw.SPUtils; + +import java.util.ArrayList; +import java.util.List; + +public class QhbzDialog extends Dialog { + private Activity activity; + private BzAdapter bzAdapter; + private List bzs; + private RecyclerView rv_bz; + + private Callback mCallback; + + public interface Callback { + void onCallback(int i); + } + + public QhbzDialog(Context context) { + super(context, R.style.ActionSheetDialogStyle); + activity = (Activity) context; + bzs = new ArrayList() {{ + this.add(R.drawable.icon_bz_0); + this.add(R.drawable.icon_bz_1); + this.add(R.drawable.icon_bz_2); + this.add(R.drawable.icon_bz_3); + this.add(R.drawable.icon_bz_4); + this.add(R.drawable.icon_bz_5); + this.add(R.drawable.icon_bz_6); + this.add(R.drawable.icon_bz_7); + this.add(R.drawable.icon_bz_8); + }}; + } + + @Override + protected void onCreate(Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.dialog_qhbz); + WindowManager windowManager = getWindow().getWindowManager(); + getWindow().setBackgroundDrawableResource(17170445); + Display defaultDisplay = windowManager.getDefaultDisplay(); + WindowManager.LayoutParams attributes = getWindow().getAttributes(); + defaultDisplay.getSize(new Point()); + getWindow().setAttributes(attributes); + setCanceledOnTouchOutside(true); + setCancelable(true); + getWindow().setDimAmount(0.3f); + initView(); + } + + private void initView() { + rv_bz = findViewById(R.id.rv_bz); + bzAdapter = new BzAdapter(bzs); + rv_bz.setLayoutManager(new GridLayoutManager(activity, 3)); + rv_bz.setAdapter(bzAdapter); + } + + public void setOnCallback(Callback callback) { + mCallback = callback; + } + + public class BzAdapter extends BaseQuickAdapter { + + BzAdapter(List list) { + super(R.layout.item_bz, list); + } + + @Override + public void convert(final BaseViewHolder baseViewHolder, Integer num) { + ImageView imageView = baseViewHolder.getView(R.id.iv_bz); + TextView textView = baseViewHolder.getView(R.id.tick); + imageView.setImageResource(num); + if (SPUtils.getInt(mContext, "themenBg", 0) == baseViewHolder.getAdapterPosition()) { + textView.setVisibility(0); + } else { + textView.setVisibility(8); + } + imageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + SPUtils.put(mContext, "themenBg", baseViewHolder.getAdapterPosition()); + if (mCallback != null) { + mCallback.onCallback(baseViewHolder.getAdapterPosition()); + } + notifyDataSetChanged(); + } + }); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/view/dialog/RemoveAppDialog.java b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/RemoveAppDialog.java new file mode 100644 index 0000000..5c920fa --- /dev/null +++ b/app/src/main/java/com/xwad/os/view/jxw/view/dialog/RemoveAppDialog.java @@ -0,0 +1,77 @@ +package com.xwad.os.view.jxw.view.dialog; + +import android.app.Dialog; +import android.content.Context; +import android.graphics.Point; +import android.os.Bundle; +import android.view.Display; +import android.view.View; +import android.view.WindowManager; +import android.widget.TextView; + +import com.xwad.os.R; + +public class RemoveAppDialog extends Dialog { + private TextView tv_cancel; + private TextView tv_name; + private TextView tv_ok; + + private String apkName; + + private Callback mCallback; + + public interface Callback { + void onCallback(); + } + + public RemoveAppDialog(Context context, String str) { + super(context, R.style.ActionSheetDialogStyle); + apkName = str; + } + + @Override + protected void onCreate(Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.dialog_removeapp); + WindowManager windowManager = getWindow().getWindowManager(); + getWindow().setBackgroundDrawableResource(17170445); + Display defaultDisplay = windowManager.getDefaultDisplay(); + WindowManager.LayoutParams attributes = getWindow().getAttributes(); + Point point = new Point(); + defaultDisplay.getSize(point); + double d = point.x; + Double.isNaN(d); + attributes.width = (int) (d * 0.8d); + getWindow().setAttributes(attributes); + setCanceledOnTouchOutside(true); + setCancelable(true); + getWindow().setDimAmount(0.3f); + initView(); + } + + private void initView() { + tv_name = findViewById(R.id.tv_name); + tv_cancel = findViewById(R.id.tv_cancel); + tv_ok = findViewById(R.id.tv_ok); + tv_name.setText(apkName); + tv_cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dismiss(); + } + }); + tv_ok.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (mCallback != null) { + mCallback.onCallback(); + } + dismiss(); + } + }); + } + + public void setOnCallback(Callback callback) { + mCallback = callback; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/DailyTasksView.java b/app/src/main/java/com/xwad/os/view/jxw/widget/DailyTasksView.java index 5f8b785..6fa2354 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/DailyTasksView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/DailyTasksView.java @@ -36,91 +36,90 @@ public class DailyTasksView extends RelativeLayout { public DailyTasksView(Context context) { super(context); - this.datas = new ArrayList(); - this.mContext = context; + datas = new ArrayList<>(); + mContext = context; init(); } public DailyTasksView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.datas = new ArrayList(); - this.mContext = context; + datas = new ArrayList<>(); + mContext = context; init(); } public DailyTasksView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.datas = new ArrayList(); - this.mContext = context; + datas = new ArrayList<>(); + mContext = context; init(); } public void showNotNetwork() { - this.ll_not_data.setVisibility(VISIBLE); + ll_not_data.setVisibility(VISIBLE); } public void hideNotNetwork() { - this.ll_not_data.setVisibility(GONE); + ll_not_data.setVisibility(GONE); } private void init() { View inflate = View.inflate(getContext(), R.layout.layout_daily_tasks, null); addView(inflate); - this.rl_rw = inflate.findViewById(R.id.rl_rw); - this.ll_not_data = inflate.findViewById(R.id.ll_not_data); - this.tv_1 = inflate.findViewById(R.id.tv_1); - this.tv_2 = inflate.findViewById(R.id.tv_2); + rl_rw = inflate.findViewById(R.id.rl_rw); + ll_not_data = inflate.findViewById(R.id.ll_not_data); + tv_1 = inflate.findViewById(R.id.tv_1); + tv_2 = inflate.findViewById(R.id.tv_2); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext()); linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL); - this.rl_rw.setLayoutManager(linearLayoutManager); - if (!Util.isNetworkAvailable(this.mContext)) { - this.ll_not_data.setVisibility(VISIBLE); + rl_rw.setLayoutManager(linearLayoutManager); + if (!Util.isNetworkAvailable(mContext)) { + ll_not_data.setVisibility(VISIBLE); } else { - this.ll_not_data.setVisibility(GONE); + ll_not_data.setVisibility(GONE); } - this.tv_1.setOnClickListener(new View.OnClickListener() { + tv_1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (Util.isNetworkAvailable(DailyTasksView.this.mContext)) { - if (DailyTasksView.this.mCallback != null) { - DailyTasksView.this.mCallback.onCallback(); + if (Util.isNetworkAvailable(mContext)) { + if (mCallback != null) { + mCallback.onCallback(); } - DailyTasksView.this.ll_not_data.setVisibility(GONE); + ll_not_data.setVisibility(GONE); return; } - ToastUtil.showTextToastDia(DailyTasksView.this.mContext, "加载失败，请检查网络后重试"); + ToastUtil.showTextToastDia(mContext, "加载失败，请检查网络后重试"); } }); - this.tv_2.setOnClickListener(new View.OnClickListener() { + tv_2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DailyTasksView.this.getContext().startActivity(new Intent("android.settings.WIFI_SETTINGS")); + getContext().startActivity(new Intent("android.settings.WIFI_SETTINGS")); } }); } public TasksAdapter getTasksAdapter() { - TasksAdapter tasksAdapter = this.tasksAdapter; return tasksAdapter; } public void setData(List list) { - this.datas.clear(); - this.datas = list; - this.tasksAdapter = new TasksAdapter(list); - this.rl_rw.setAdapter(this.tasksAdapter); - if (!Util.isNetworkAvailable(this.mContext)) { - this.ll_not_data.setVisibility(VISIBLE); + datas.clear(); + datas = list; + tasksAdapter = new TasksAdapter(list); + rl_rw.setAdapter(tasksAdapter); + if (!Util.isNetworkAvailable(mContext)) { + ll_not_data.setVisibility(VISIBLE); } else { - this.ll_not_data.setVisibility(GONE); + ll_not_data.setVisibility(GONE); } } public List getData() { - return this.datas; + return datas; } public void setOnCallback(Callback callback) { - this.mCallback = callback; + mCallback = callback; } } diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView.java b/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView.java index 7518f65..ac0ef82 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView.java @@ -21,23 +21,23 @@ public class DashuDiaView extends LinearLayout { public DashuDiaView(Context context) { super(context); - this.mContext = context; + mContext = context; } public DashuDiaView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.mContext = context; + mContext = context; TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.DushuGrade); - this.grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); + grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); obtainStyledAttributes.recycle(); init(); } public DashuDiaView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.mContext = context; + mContext = context; TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.DushuGrade, i, 0); - this.grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); + grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); obtainStyledAttributes.recycle(); init(); } @@ -45,17 +45,17 @@ public class DashuDiaView extends LinearLayout { private void init() { View inflate = View.inflate(getContext(), R.layout.layout_dashu_dia, null); addView(inflate); - this.iv_djbg = inflate.findViewById(R.id.iv_djbg); - this.tv_dj = inflate.findViewById(R.id.tv_dj); - TextView textView = this.tv_dj; - textView.setText("LV" + this.grade); + iv_djbg = inflate.findViewById(R.id.iv_djbg); + tv_dj = inflate.findViewById(R.id.tv_dj); + TextView textView = tv_dj; + textView.setText("LV" + grade); } public void setdj(int i) { - Log.e("zsj", this.grade + "---------" + i); - if (this.grade <= i) { + Log.e("zsj", grade + "---------" + i); + if (grade <= i) { Resources resources = getResources(); - this.iv_djbg.setBackgroundResource(resources.getIdentifier("icon_dia_ds_" + this.grade, "drawable", this.mContext.getPackageName())); + iv_djbg.setBackgroundResource(resources.getIdentifier("icon_dia_ds_" + grade, "drawable", mContext.getPackageName())); } } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView10.java b/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView10.java index 636bc0e..b90442b 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView10.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/DashuDiaView10.java @@ -19,23 +19,23 @@ public class DashuDiaView10 extends LinearLayout { public DashuDiaView10(Context context) { super(context); - this.mContext = context; + mContext = context; } public DashuDiaView10(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.mContext = context; + mContext = context; TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.DushuGrade); - this.grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); + grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); obtainStyledAttributes.recycle(); init(); } public DashuDiaView10(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.mContext = context; + mContext = context; TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.DushuGrade, i, 0); - this.grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); + grade = obtainStyledAttributes.getInteger(R.styleable.DushuGrade_drade, 0); obtainStyledAttributes.recycle(); init(); } @@ -43,16 +43,16 @@ public class DashuDiaView10 extends LinearLayout { private void init() { View inflate = View.inflate(getContext(), R.layout.layout_dashu_dia_10, null); addView(inflate); - this.iv_djbg = inflate.findViewById(R.id.iv_djbg); - this.tv_dj = inflate.findViewById(R.id.tv_dj); - TextView textView = this.tv_dj; - textView.setText("LV" + this.grade); + iv_djbg = inflate.findViewById(R.id.iv_djbg); + tv_dj = inflate.findViewById(R.id.tv_dj); + TextView textView = tv_dj; + textView.setText("LV" + grade); } public void setdj(int i) { - if (this.grade <= i) { + if (grade <= i) { Resources resources = getResources(); - this.iv_djbg.setBackgroundResource(resources.getIdentifier("icon_dia_ds_" + this.grade, "drawable", this.mContext.getPackageName())); + iv_djbg.setBackgroundResource(resources.getIdentifier("icon_dia_ds_" + grade, "drawable", mContext.getPackageName())); } } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/JxwPAGView.java b/app/src/main/java/com/xwad/os/view/jxw/widget/JxwPAGView.java index b7b3f20..164d63e 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/JxwPAGView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/JxwPAGView.java @@ -10,15 +10,15 @@ public class JxwPAGView extends PAGView { public JxwPAGView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.mContext = context; + mContext = context; } public JxwPAGView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.mContext = context; + mContext = context; } public void setAssets(String str) { - setComposition(PAGFile.Load(this.mContext.getAssets(), str)); + setComposition(PAGFile.Load(mContext.getAssets(), str)); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/MyBannerIndicator.java b/app/src/main/java/com/xwad/os/view/jxw/widget/MyBannerIndicator.java index 56c9451..f201567 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/MyBannerIndicator.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/MyBannerIndicator.java @@ -26,48 +26,48 @@ public class MyBannerIndicator extends View { public MyBannerIndicator(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.mCellRadius = 8; - this.mCellMargin = 15; - this.mIndicatorColor = Color.parseColor("#FFFFFF"); - this.mNoIndicatorColor = Color.parseColor("#66FFFFFF"); + mCellRadius = 8; + mCellMargin = 15; + mIndicatorColor = Color.parseColor("#FFFFFF"); + mNoIndicatorColor = Color.parseColor("#66FFFFFF"); init(); } public void init() { - this.mPaint = new Paint(); - this.mPaint.setAntiAlias(true); + mPaint = new Paint(); + mPaint.setAntiAlias(true); } public void setCellCount(int i) { - this.mCellCount = i; + mCellCount = i; invalidate(); } public void setCurrentPosition(int i) { - this.currentPosition = i; + currentPosition = i; invalidate(); } @Override protected void onMeasure(int i, int i2) { super.onMeasure(i, i2); - int i3 = this.mCellCount; - setMeasuredDimension(resolveSize(getPaddingLeft() + getPaddingRight() + (this.mCellRadius * 2 * i3) + (this.mCellMargin * (i3 - 1)), i), - resolveSize(getPaddingTop() + getPaddingBottom() + (this.mCellRadius * 2), i2)); + int i3 = mCellCount; + setMeasuredDimension(resolveSize(getPaddingLeft() + getPaddingRight() + (mCellRadius * 2 * i3) + (mCellMargin * (i3 - 1)), i), + resolveSize(getPaddingTop() + getPaddingBottom() + (mCellRadius * 2), i2)); } @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - for (int i = 0; i < this.mCellCount; i++) { - if (i == this.currentPosition) { - this.mPaint.setColor(this.mIndicatorColor); + for (int i = 0; i < mCellCount; i++) { + if (i == currentPosition) { + mPaint.setColor(mIndicatorColor); } else { - this.mPaint.setColor(this.mNoIndicatorColor); + mPaint.setColor(mNoIndicatorColor); } int paddingLeft = getPaddingLeft(); - int i2 = this.mCellRadius; - canvas.drawCircle(paddingLeft + (i * i2 * 2) + (this.mCellMargin * i) + i2, getHeight() / 2, this.mCellRadius, this.mPaint); + int i2 = mCellRadius; + canvas.drawCircle(paddingLeft + (i * i2 * 2) + (mCellMargin * i) + i2, getHeight() / 2, mCellRadius, mPaint); } } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/NoScrollViewPager.java b/app/src/main/java/com/xwad/os/view/jxw/widget/NoScrollViewPager.java index a929cf0..dd750b6 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/NoScrollViewPager.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/NoScrollViewPager.java @@ -12,14 +12,14 @@ public class NoScrollViewPager extends ViewPager { public NoScrollViewPager(Context context) { super(context); - this.noScroll = false; - this.noScrollAnim = false; + noScroll = false; + noScrollAnim = false; } public NoScrollViewPager(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.noScroll = false; - this.noScrollAnim = false; + noScroll = false; + noScrollAnim = false; } public void setNoScroll(boolean noScroll) { @@ -32,12 +32,12 @@ public class NoScrollViewPager extends ViewPager { @Override public boolean onTouchEvent(MotionEvent motionEvent) { - return !this.noScroll && super.onTouchEvent(motionEvent); + return !noScroll && super.onTouchEvent(motionEvent); } @Override public boolean onInterceptTouchEvent(MotionEvent motionEvent) { - return !this.noScroll && super.onInterceptTouchEvent(motionEvent); + return !noScroll && super.onInterceptTouchEvent(motionEvent); } @Override @@ -47,6 +47,6 @@ public class NoScrollViewPager extends ViewPager { @Override public void setCurrentItem(int item) { - super.setCurrentItem(item, this.noScrollAnim); + super.setCurrentItem(item, noScrollAnim); } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/RecyclerMarginClickHelper.java b/app/src/main/java/com/xwad/os/view/jxw/widget/RecyclerMarginClickHelper.java new file mode 100644 index 0000000..e079be2 --- /dev/null +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/RecyclerMarginClickHelper.java @@ -0,0 +1,59 @@ +package com.xwad.os.view.jxw.widget; + +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + +public class RecyclerMarginClickHelper { + public static void setOnMarginClickListener(final RecyclerView recyclerView, final View.OnClickListener onClickListener) { + if (recyclerView == null || onClickListener == null) { + return; + } + final GestureDetector gestureDetector = new GestureDetector(recyclerView.getContext(), new GestureDetector.OnGestureListener() { + @Override + public boolean onDown(MotionEvent motionEvent) { + return false; + } + + @Override + public boolean onFling(MotionEvent motionEvent, MotionEvent motionEvent2, float f, float f2) { + return false; + } + + @Override + public void onLongPress(MotionEvent motionEvent) { + } + + @Override + public boolean onScroll(MotionEvent motionEvent, MotionEvent motionEvent2, float f, float f2) { + return false; + } + + @Override + public void onShowPress(MotionEvent motionEvent) { + } + + @Override + public boolean onSingleTapUp(MotionEvent motionEvent) { + View.OnClickListener onClickListener2 = onClickListener; + if (onClickListener2 != null) { + onClickListener2.onClick(recyclerView); + return false; + } + return false; + } + }); + + recyclerView.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + if (view instanceof RecyclerView) { + return gestureDetector.onTouchEvent(motionEvent); + } + return false; + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/TasksAdapter.java b/app/src/main/java/com/xwad/os/view/jxw/widget/TasksAdapter.java index 5210f98..3c1841d 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/TasksAdapter.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/TasksAdapter.java @@ -44,22 +44,22 @@ public class TasksAdapter extends BaseQuickAdapter { textView2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (TasksAdapter.this.listener != null) { - TasksAdapter.this.listener.onClick(baseViewHolder.getAdapterPosition()); + if (listener != null) { + listener.onClick(baseViewHolder.getAdapterPosition()); } } }); textView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (TasksAdapter.this.listener != null) { - TasksAdapter.this.listener.onQwcClick(baseViewHolder.getAdapterPosition()); + if (listener != null) { + listener.onQwcClick(baseViewHolder.getAdapterPosition()); } } }); } public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.listener = onItemClickListener; + listener = onItemClickListener; } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/TreeView.java b/app/src/main/java/com/xwad/os/view/jxw/widget/TreeView.java index 0662ca6..32fd2b8 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/TreeView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/TreeView.java @@ -19,7 +19,10 @@ import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; -import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; + +import com.ufreedom.uikit.FloatingText; +import com.ufreedom.uikit.effect.CurveFloatingPathEffect; +import com.ufreedom.uikit.effect.CurvePathFloatingAnimator; import com.xwad.os.R; import com.xwad.os.bean.jxw.TaskBean; import com.xwad.os.jxw.CommonUtil; @@ -28,13 +31,12 @@ import com.xwad.os.jxw.JiaoShuiDialog; import com.xwad.os.jxw.SPUtils; import com.xwad.os.jxw.StudyRecordAPKInfo; import com.xwad.os.jxw.Util; -import com.ufreedom.uikit.FloatingText; -import com.ufreedom.uikit.effect.CurveFloatingPathEffect; -import com.ufreedom.uikit.effect.CurvePathFloatingAnimator; + +import org.libpag.PAGView; + import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.libpag.PAGView; public class TreeView extends RelativeLayout { private String PREPARE_START_MH_SOUND_PATH; @@ -64,7 +66,7 @@ public class TreeView extends RelativeLayout { JxwPAGView pad_xddx; PopupWindow pop_js; WaterR relative; -// NetRepository repository; + // NetRepository repository; RelativeLayout rl_root; TextView tv_jiaoshui; TextView tv_xljt; @@ -80,73 +82,73 @@ public class TreeView extends RelativeLayout { public TreeView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.PREPARE_START_MH_SOUND_PATH = "sound/dsyx.mp3"; - this.expBeanList = new ArrayList(); -// this.repository = new NetRepository(); - this.dataList = new ArrayList(); - this.current_dj = -1; - this.handler = new Handler(Looper.getMainLooper()) { - @Override + PREPARE_START_MH_SOUND_PATH = "sound/dsyx.mp3"; + expBeanList = new ArrayList(); +// repository = new NetRepository(); + dataList = new ArrayList(); + current_dj = -1; + handler = new Handler(Looper.getMainLooper()) { + @Override public void handleMessage(Message message) { super.handleMessage(message); int i = message.what; if (i == 1) { - TreeView.this.tv_jiaoshui.setVisibility(GONE); + tv_jiaoshui.setVisibility(GONE); } else if (i == 2) { - TreeView.this.tv_yijiaoshui.setVisibility(GONE); + tv_yijiaoshui.setVisibility(GONE); } else if (i == 3) { - TreeView.this.ll_xljt.setVisibility(GONE); + ll_xljt.setVisibility(GONE); } else if (i != 200) { } else { if (message.obj.toString().equals("今天已经添加，不需要重复添加！")) { - TreeView.this.tv_jiaoshui.setVisibility(VISIBLE); - TreeView.this.handler.sendEmptyMessageDelayed(1, AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS); + tv_jiaoshui.setVisibility(VISIBLE); + handler.sendEmptyMessageDelayed(1, 2000); } else if (message.obj.toString().contains("添加成功")) { - Util.insertData(TreeView.this.mContext, "pb_czjh_sh_click", "click", 1L, "水壶浇水次数", "pb_czjh", "", Constant.MODULE); + Util.insertData(mContext, "pb_czjh_sh_click", "click", 1L, "水壶浇水次数", "pb_czjh", "", Constant.MODULE); SPUtils.saveString("jsDate", Util.getDate()); - TreeView.this.iv_sh.setVisibility(GONE); - TreeView.this.tv_yijiaoshui.setVisibility(GONE); - JiaoShuiDialog jiaoShuiDialog = new JiaoShuiDialog(TreeView.this.mContext); + iv_sh.setVisibility(GONE); + tv_yijiaoshui.setVisibility(GONE); + JiaoShuiDialog jiaoShuiDialog = new JiaoShuiDialog(mContext); jiaoShuiDialog.show(); - jiaoShuiDialog.setOnCallback(new JiaoShuiDialog.Callback() { - @Override + jiaoShuiDialog.setOnCallback(new JiaoShuiDialog.Callback() { + @Override public void onCallback() { - TreeView.this.iv_sh.setVisibility(VISIBLE); + iv_sh.setVisibility(VISIBLE); } }); - TreeView.this.getTaskUserInfo(); + getTaskUserInfo(); } } } }; - this.location = new int[2]; - this.activity = (Activity) context; - this.mContext = context; + location = new int[2]; + activity = (Activity) context; + mContext = context; initViews(); initData(); } public void onResume() { Log.e("tree", "onResume"); - JxwPAGView jxwPAGView = this.iv_dashu; + JxwPAGView jxwPAGView = iv_dashu; if (jxwPAGView != null) { jxwPAGView.setRepeatCount(-1); - this.iv_dashu.play(); + iv_dashu.play(); } - JxwPAGView jxwPAGView2 = this.pad_xddx; + JxwPAGView jxwPAGView2 = pad_xddx; if (jxwPAGView2 != null) { jxwPAGView2.setRepeatCount(-1); - this.pad_xddx.play(); + pad_xddx.play(); } } public void onPause() { Log.e("tree", "onPause"); - JxwPAGView jxwPAGView = this.iv_dashu; + JxwPAGView jxwPAGView = iv_dashu; if (jxwPAGView != null) { jxwPAGView.pause(); } - JxwPAGView jxwPAGView2 = this.pad_xddx; + JxwPAGView jxwPAGView2 = pad_xddx; if (jxwPAGView2 != null) { jxwPAGView2.pause(); } @@ -154,83 +156,83 @@ public class TreeView extends RelativeLayout { private void initViews() { View inflate = View.inflate(getContext(), R.layout.layout_tree, null); - this.iv_sh = inflate.findViewById(R.id.iv_sh); - this.relative = inflate.findViewById(R.id.relative); - this.tv_yijiaoshui = inflate.findViewById(R.id.tv_yijiaoshui); - this.tv_jiaoshui = inflate.findViewById(R.id.tv_jiaoshui); - this.ll_xljt = inflate.findViewById(R.id.ll_xljt); - this.tv_xljt = inflate.findViewById(R.id.tv_xljt); - this.rl_root = inflate.findViewById(R.id.rl_root); - this.iv_dashu = inflate.findViewById(R.id.iv_dashu); - this.pad_xddx = inflate.findViewById(R.id.pad_xddx); - this.pad_xddx.setAssets("pag/xddx.pag"); - this.pad_xddx.setRepeatCount(-1); - this.pad_xddx.play(); - this.mPlayer = new MediaPlayer(); + iv_sh = inflate.findViewById(R.id.iv_sh); + relative = inflate.findViewById(R.id.relative); + tv_yijiaoshui = inflate.findViewById(R.id.tv_yijiaoshui); + tv_jiaoshui = inflate.findViewById(R.id.tv_jiaoshui); + ll_xljt = inflate.findViewById(R.id.ll_xljt); + tv_xljt = inflate.findViewById(R.id.tv_xljt); + rl_root = inflate.findViewById(R.id.rl_root); + iv_dashu = inflate.findViewById(R.id.iv_dashu); + pad_xddx = inflate.findViewById(R.id.pad_xddx); + pad_xddx.setAssets("pag/xddx.pag"); + pad_xddx.setRepeatCount(-1); + pad_xddx.play(); + mPlayer = new MediaPlayer(); if (Util.getDate().equals(SPUtils.getString("jsDate"))) { - this.tv_yijiaoshui.setVisibility(GONE); + tv_yijiaoshui.setVisibility(GONE); } else { - this.tv_yijiaoshui.setVisibility(VISIBLE); - this.handler.sendEmptyMessageDelayed(2, 3000L); + tv_yijiaoshui.setVisibility(VISIBLE); + handler.sendEmptyMessageDelayed(2, 3000L); } - this.iv_dashu.setOnClickListener(new View.OnClickListener() { - @Override + iv_dashu.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View view) { - JxwPAGView jxwPAGView = TreeView.this.iv_dashu; - jxwPAGView.setAssets("pag/lv_" + TreeView.this.current_dj + "_jh.pag"); - TreeView.this.playSound(); + JxwPAGView jxwPAGView = iv_dashu; + jxwPAGView.setAssets("pag/lv_" + current_dj + "_jh.pag"); + playSound(); try { - TreeView.this.tv_xljt.setText(TreeView.this.dataList.get(new Random().nextInt(TreeView.this.dataList.size()))); - TreeView.this.ll_xljt.setVisibility(VISIBLE); - TreeView.this.handler.removeMessages(3); - TreeView.this.handler.sendEmptyMessageDelayed(3, 3000L); + tv_xljt.setText(dataList.get(new Random().nextInt(dataList.size()))); + ll_xljt.setVisibility(VISIBLE); + handler.removeMessages(3); + handler.sendEmptyMessageDelayed(3, 3000L); } catch (Exception unused) { } } }); - this.iv_dashu.addListener(new PAGView.PAGViewListener() { - @Override + iv_dashu.addListener(new PAGView.PAGViewListener() { + @Override public void onAnimationStart(PAGView pAGView) { } - @Override + @Override public void onAnimationUpdate(PAGView pAGView) { } - @Override + @Override public void onAnimationEnd(PAGView pAGView) { Log.e("zsj", "onAnimationEnd"); } - @Override + @Override public void onAnimationCancel(PAGView pAGView) { Log.e("zsj", "onAnimationCancel"); } - @Override + @Override public void onAnimationRepeat(PAGView pAGView) { - JxwPAGView jxwPAGView = TreeView.this.iv_dashu; - jxwPAGView.setAssets("pag/lv_" + TreeView.this.current_dj + "_dashu.pag"); + JxwPAGView jxwPAGView = iv_dashu; + jxwPAGView.setAssets("pag/lv_" + current_dj + "_dashu.pag"); } }); - this.relative.setOnWaterItemListener(new WaterR.OnWaterItemListener() { - @Override + relative.setOnWaterItemListener(new WaterR.OnWaterItemListener() { + @Override public void onItemClick(TaskBean taskBean) { - FloatingText.FloatingTextBuilder floatingPathEffect = new FloatingText.FloatingTextBuilder((Activity) TreeView.this.mContext).textColor(-1).textSize(TreeView.this.getResources().getDimensionPixelSize(R.dimen.x40)).floatingAnimatorEffect(new CurvePathFloatingAnimator()).floatingPathEffect(new CurveFloatingPathEffect()); + FloatingText.FloatingTextBuilder floatingPathEffect = new FloatingText.FloatingTextBuilder((Activity) mContext).textColor(-1).textSize(getResources().getDimensionPixelSize(R.dimen.x40)).floatingAnimatorEffect(new CurvePathFloatingAnimator()).floatingPathEffect(new CurveFloatingPathEffect()); FloatingText build = floatingPathEffect.textContent("+" + taskBean.getExperience()).build(); build.attach2Window(); - build.startFloating(TreeView.this.iv_dashu); - TreeView.this.expBeanList.remove(taskBean); - TreeView.this.getTaskExp(taskBean.getId(), StudyRecordAPKInfo.ARG_FILE_LIST_MOVIE); + build.startFloating(iv_dashu); + expBeanList.remove(taskBean); + getTaskExp(taskBean.getId(), StudyRecordAPKInfo.ARG_FILE_LIST_MOVIE); } }); - this.iv_sh.setOnClickListener(new View.OnClickListener() { - @Override + iv_sh.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View view) { if (CommonUtil.isFastClick()) { - TreeView.this.tv_yijiaoshui.setVisibility(GONE); - TreeView.this.tv_jiaoshui.setVisibility(GONE); - TreeView.this.getWateringAdd(); + tv_yijiaoshui.setVisibility(GONE); + tv_jiaoshui.setVisibility(GONE); + getWateringAdd(); } } }); @@ -239,35 +241,35 @@ public class TreeView extends RelativeLayout { public void addExp(List list) { - this.expBeanList.clear(); - this.expBeanList.addAll(list); - this.relative.removeAllViews(); - WaterR waterR = this.relative; + expBeanList.clear(); + expBeanList.addAll(list); + relative.removeAllViews(); + WaterR waterR = relative; waterR.isR = true; waterR.listX.clear(); - this.relative.listY.clear(); + relative.listY.clear(); int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.x50); int dimensionPixelSize2 = getResources().getDimensionPixelSize(R.dimen.x30); - for (int i = 0; i < this.expBeanList.size(); i++) { + for (int i = 0; i < expBeanList.size(); i++) { if (i == 0) { - addChildView(this.expBeanList.get(i), this.relative, i + 1, dimensionPixelSize * 2, dimensionPixelSize2 * 2); + addChildView(expBeanList.get(i), relative, i + 1, dimensionPixelSize * 2, dimensionPixelSize2 * 2); } else if (i == 1) { - addChildView(this.expBeanList.get(i), this.relative, i + 1, dimensionPixelSize * 5, dimensionPixelSize2 * 1); + addChildView(expBeanList.get(i), relative, i + 1, dimensionPixelSize * 5, dimensionPixelSize2 * 1); } else if (i == 2) { - addChildView(this.expBeanList.get(i), this.relative, i + 1, dimensionPixelSize * 7, dimensionPixelSize2 * 4); + addChildView(expBeanList.get(i), relative, i + 1, dimensionPixelSize * 7, dimensionPixelSize2 * 4); } else if (i == 3) { - addChildView(this.expBeanList.get(i), this.relative, i + 1, dimensionPixelSize * 3, dimensionPixelSize2 * 5); + addChildView(expBeanList.get(i), relative, i + 1, dimensionPixelSize * 3, dimensionPixelSize2 * 5); } } - this.relative.invalidate(); + relative.invalidate(); } private void addChildView(final TaskBean taskBean, final WaterR waterR, int i, final int i2, final int i3) { - waterR.postDelayed(new Runnable() { - @Override + waterR.postDelayed(new Runnable() { + @Override public void run() { ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(-2, -2); - WaterView waterView = new WaterView(TreeView.this.mContext, taskBean); + WaterView waterView = new WaterView(mContext, taskBean); waterView.setLayoutParams(layoutParams); waterR.setChildPosition(i2, i3); waterR.addView(waterView); @@ -281,13 +283,13 @@ public class TreeView extends RelativeLayout { } public void getTaskStudyList() { -// this.repository.getTaskStudyList(new IDataCallback>() { +// repository.getTaskStudyList(new IDataCallback>() { // @Override // public void success(List list) { // if (list == null || list.size() <= 0) { // return; // } -// TreeView.this.addExp(list); +// addExp(list); // } // // @Override @@ -299,12 +301,12 @@ public class TreeView extends RelativeLayout { public void getTaskExp(String str, String str2) { // try { -// this.repository.getTaskExp(str, str2, new IDataCallback() { +// repository.getTaskExp(str, str2, new IDataCallback() { // @Override // public void success(String str3) { -// TreeView.this.getTaskUserInfo(); -// if (TreeView.this.listener != null) { -// TreeView.this.listener.onClick(); +// getTaskUserInfo(); +// if (listener != null) { +// listener.onClick(); // } // } // @@ -319,25 +321,25 @@ public class TreeView extends RelativeLayout { } public void getTaskUserInfo() { -// this.repository.getTaskUserInfo(new IDataCallback() { +// repository.getTaskUserInfo(new IDataCallback() { // @Override // public void success(UserExperience userExperience) { // Log.e("jxw", userExperience + ""); // try { -// if (TreeView.this.current_dj == -1) { -// TreeView.this.current_dj = Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())); -// JxwPAGView jxwPAGView = TreeView.this.iv_dashu; -// jxwPAGView.setAssets("pag/lv_" + TreeView.this.current_dj + "_dashu.pag"); -// TreeView.this.iv_dashu.setRepeatCount(-1); -// TreeView.this.iv_dashu.play(); -// } else if (TreeView.this.current_dj != -1 && Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())) > TreeView.this.current_dj) { -// JxwPAGView jxwPAGView2 = TreeView.this.iv_dashu; -// jxwPAGView2.setAssets("pag/lv_" + TreeView.this.current_dj + "_sj.pag"); -// TreeView.this.current_dj = Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())); +// if (current_dj == -1) { +// current_dj = Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())); +// JxwPAGView jxwPAGView = iv_dashu; +// jxwPAGView.setAssets("pag/lv_" + current_dj + "_dashu.pag"); +// iv_dashu.setRepeatCount(-1); +// iv_dashu.play(); +// } else if (current_dj != -1 && Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())) > current_dj) { +// JxwPAGView jxwPAGView2 = iv_dashu; +// jxwPAGView2.setAssets("pag/lv_" + current_dj + "_sj.pag"); +// current_dj = Integer.parseInt(userExperience.getLevelCode().substring(2, userExperience.getLevelCode().length())); // } -// SPUtils.saveString("treeDj", String.valueOf(TreeView.this.current_dj)); -// SPUtils.put(TreeView.this.mContext, "Experience", Integer.valueOf(userExperience.getExperience())); -// SPUtils.put(TreeView.this.mContext, "MaxExperience", Integer.valueOf(userExperience.getLevelMaxExperience())); +// SPUtils.saveString("treeDj", String.valueOf(current_dj)); +// SPUtils.put(mContext, "Experience", Integer.valueOf(userExperience.getExperience())); +// SPUtils.put(mContext, "MaxExperience", Integer.valueOf(userExperience.getLevelMaxExperience())); // } catch (Exception unused) { // } // } @@ -345,14 +347,14 @@ public class TreeView extends RelativeLayout { // @Override // public void failure(int i, String str) { // if (!TextUtils.isEmpty(SPUtils.getString("treeDj"))) { -// TreeView.this.current_dj = Integer.parseInt(SPUtils.getString("treeDj")); +// current_dj = Integer.parseInt(SPUtils.getString("treeDj")); // } else { -// TreeView.this.current_dj = 0; +// current_dj = 0; // } -// JxwPAGView jxwPAGView = TreeView.this.iv_dashu; -// jxwPAGView.setAssets("pag/lv_" + TreeView.this.current_dj + "_dashu.pag"); -// TreeView.this.iv_dashu.setRepeatCount(-1); -// TreeView.this.iv_dashu.play(); +// JxwPAGView jxwPAGView = iv_dashu; +// jxwPAGView.setAssets("pag/lv_" + current_dj + "_dashu.pag"); +// iv_dashu.setRepeatCount(-1); +// iv_dashu.play(); // Log.e("jxw", str); // } // }); @@ -360,14 +362,14 @@ public class TreeView extends RelativeLayout { public void getWateringAdd() { // try { -// this.repository.getWateringAdd(new IDataCallback() { +// repository.getWateringAdd(new IDataCallback() { // @Override // public void success(String str) { // Log.e("jxw", str); // Message obtain = Message.obtain(); // obtain.obj = str; // obtain.what = 200; -// TreeView.this.handler.sendMessage(obtain); +// handler.sendMessage(obtain); // } // // @Override @@ -391,399 +393,399 @@ public class TreeView extends RelativeLayout { } private void initData() { - this.dataList.add("一年之计在于春，一日之计在于晨。"); - this.dataList.add("一寸光阴一寸金，寸金难买寸光阴。"); - this.dataList.add("种瓜得瓜，种豆得豆。"); - this.dataList.add("前人栽树，后人乘凉。"); - this.dataList.add("千里之行，始于足下。"); - this.dataList.add("百尺竿头，更进一步。"); - this.dataList.add("朝霞不出门，晚霞行千里。"); - this.dataList.add("有雨山戴帽，无雨半山腰。"); - this.dataList.add("早晨下雨当日晴，晚上下雨到天明。"); - this.dataList.add("蚂蚁搬家蛇过道，大雨不久要来到。"); - this.dataList.add("不知则问，不能则学。"); - this.dataList.add("读书百遍，而义自见。"); - this.dataList.add("读万卷书，行万里路。"); - this.dataList.add("己所不欲，勿施于人。"); - this.dataList.add("与朋友交，言而有信。"); - this.dataList.add("不以规矩，不能成方圆。"); - this.dataList.add("有山皆图画，无水不文章。"); - this.dataList.add("白马西风塞上，杏花烟雨江南。"); - this.dataList.add("清风明月本无价，近水远山皆有情。"); - this.dataList.add("雾锁山头山锁雾，天连水尾水连天。"); - this.dataList.add("穷且益坚，不坠青云之志。"); - this.dataList.add("予人玫瑰，手有余香。"); - this.dataList.add("平时肯帮人，急时有人帮。"); - this.dataList.add("与其锦上添花，不如雪中送炭。"); - this.dataList.add("诚信者，天下之结也。"); - this.dataList.add("灯不拨不亮，理不辩不明。"); - this.dataList.add("有理走遍天下，无理寸步难行。"); - this.dataList.add("一时强弱在于力，万古胜负在于理。"); - this.dataList.add("二人同心，其利断金。"); - this.dataList.add("三个臭皮匠，顶个诸葛亮。"); - this.dataList.add("一个篱笆三个桩，一个好汉三个帮。"); - this.dataList.add("仁者爱人，有礼者敬人。"); - this.dataList.add("与人善言，暖于布帛；伤人以言，深于矛戟。"); - this.dataList.add("见善则迁，有过则改。"); - this.dataList.add("过而不改，是谓过矣。"); - this.dataList.add("人谁无过？过而能改，善莫大焉。"); - this.dataList.add("兵来将挡，水来土掩。"); - this.dataList.add("不入虎穴，焉得虎子。"); - this.dataList.add("眼见为实，耳听为虚。"); - this.dataList.add("近朱者赤，近墨者黑。"); - this.dataList.add("好问则裕，自用则小。"); - this.dataList.add("博学之，审问之，慎思之，明辨之，笃行之。"); - this.dataList.add("智能之士，不学不成，不问不知。"); - this.dataList.add("人非生而知之者，孰能无惑？"); - this.dataList.add("尺有所短，寸有所长。"); - this.dataList.add("机不可失，时不再来。"); - this.dataList.add("差之毫厘，谬以千里。"); - this.dataList.add("病从口入，祸从口出。"); - this.dataList.add("一言既出，驷马难追。"); - this.dataList.add("比上不足，比下有余。"); - this.dataList.add("诗和音乐一样，生命全在节奏。"); - this.dataList.add("天行健，君子以自强不息。"); - this.dataList.add("胜人者有力，自胜者强。"); - this.dataList.add("生于忧患而死于安乐。"); - this.dataList.add("少年不知勤学苦，老来方知读书迟。"); - this.dataList.add("一日读书一日功，一日不读十日空。"); - this.dataList.add("学习不怕根底浅，只要迈步总不迟。"); - this.dataList.add("书山有路勤为径，学海无涯苦作舟。"); - this.dataList.add("不饱食以终日，不弃功于寸阴。"); - this.dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); - this.dataList.add("莫等闲，白了少年头，空悲切。"); - this.dataList.add("多少事，从来急；天地转，光阴迫。一万年太久，只争朝夕。"); - this.dataList.add("克勤于邦，克俭于家。"); - this.dataList.add("居安思危，戒奢以俭。"); - this.dataList.add("由俭入奢易，由奢入俭难。"); - this.dataList.add("一粥一饭，当思来处不易；半丝半缕，恒念物力维艰。"); - this.dataList.add("君子喻于义，小人喻于利。"); - this.dataList.add("君子坦荡荡，小人长戚戚。"); - this.dataList.add("人有耻，则能有所不为。"); - this.dataList.add("捐躯赴国难，视死忽如归。"); - this.dataList.add("祖宗疆土，当以死守，不可以尺寸与人。"); - this.dataList.add("无情未必真豪杰，怜子如何不丈夫。"); - this.dataList.add("其实地上本没有路，走的人多了，也便成了路。"); - this.dataList.add("惟有民魂是值得宝贵的，惟有他发扬起来，中国才有真进步。"); - this.dataList.add("读书须用意，一字值千金。"); - this.dataList.add("莫道君行早，更有早行人。"); - this.dataList.add("听君一席话，胜读十年书。"); - this.dataList.add("路遥知马力，日久见人心。"); - this.dataList.add("近水知鱼性，近山识鸟音。"); - this.dataList.add("有意栽花花不发，无心插柳柳成荫。"); - this.dataList.add("良药苦口利于病，忠言逆耳利于行。"); - this.dataList.add("树欲静而风不止，子欲养而亲不待。"); - this.dataList.add("常将有日思无日，莫把无时当有时。"); - this.dataList.add("书到用时方恨少，事非经过不知难。"); - this.dataList.add("穷则变，变则通，通则久。"); - this.dataList.add("苟日新，日日新，又日新。"); - this.dataList.add("青，取之于蓝，而青于蓝。"); - this.dataList.add("苟利于民，不必法古；苟周于事，不必循旧。"); - this.dataList.add("不知则问，不能则学。"); - this.dataList.add("读书百遍，而义自见。"); - this.dataList.add("读万卷书，行万里路。"); - this.dataList.add("己所不欲，勿施于人。"); - this.dataList.add("与朋友交，言而有信。"); - this.dataList.add("不以规矩，不能成方圆。"); - this.dataList.add("穷且益坚，不坠青云之志。"); - this.dataList.add("诚信者，天下之结也。"); - this.dataList.add("仁者爱人，有礼者敬人。"); - this.dataList.add("与人善言，暖于布帛；伤人以言，深于矛戟。"); - this.dataList.add("见善则迁，有过则改。"); - this.dataList.add("过而不改，是谓过矣。"); - this.dataList.add("人谁无过？过而能改，善莫大焉。"); - this.dataList.add("好问则裕，自用则小。"); - this.dataList.add("博学之，审问之，慎思之，明辨之，笃行之。"); - this.dataList.add("智能之士，不学不成，不问不知。"); - this.dataList.add("人非生而知之者，孰能无惑？"); - this.dataList.add("诗和音乐一样，生命全在节奏。"); - this.dataList.add("诗是人类向未来寄发的信息，诗给人类以朝向理想的勇气。"); - this.dataList.add("诗是强烈感情的自然流露，它源于宁静中回忆起来的情感。"); - this.dataList.add("天行健，君子以自强不息。"); - this.dataList.add("胜人者有力，自胜者强。"); - this.dataList.add("生于忧患而死于安乐。"); - this.dataList.add("少年不知勤学苦，老来方知读书迟。"); - this.dataList.add("一日读书一日功，一日不读十日空。"); - this.dataList.add("学习不怕根底浅，只要迈步总不迟。"); - this.dataList.add("书山有路勤为径，学海无涯苦作舟。"); - this.dataList.add("不饱食以终日，不弃功于寸阴。"); - this.dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); - this.dataList.add("莫等闲，白了少年头，空悲切。"); - this.dataList.add("多少事，从来急；天地转，光阴迫。一万年太久，只争朝夕。"); - this.dataList.add("克勤于邦，克俭于家。"); - this.dataList.add("居安思危，戒奢以俭。"); - this.dataList.add("由俭入奢易，由奢入俭难。"); - this.dataList.add("一粥一饭，当思来处不易；半丝半缕，恒念物力维艰。"); - this.dataList.add("君子喻于义，小人喻于利。"); - this.dataList.add("君子坦荡荡，小人长戚戚。"); - this.dataList.add("恻隐之心，仁之端也。"); - this.dataList.add("人有耻，则能有所不为。"); - this.dataList.add("捐躯赴国难，视死忽如归。"); - this.dataList.add("祖宗疆土，当以死守，不可以尺寸与人。"); - this.dataList.add("无情未必真豪杰，怜子如何不丈夫。"); - this.dataList.add("其实地上本没有路，走的人多了，也便成了路。"); - this.dataList.add("惟有民魂是值得宝贵的，惟有他发扬起来，中国才有真进步。"); - this.dataList.add("读书须用意，一字值千金。"); - this.dataList.add("莫道君行早，更有早行人。"); - this.dataList.add("穷则变，变则通，通则久。"); - this.dataList.add("苟日新，日日新，又日新。"); - this.dataList.add("青，取之于蓝，而青于蓝。"); - this.dataList.add("苟利于民，不必法古；苟周于事，不必循旧。"); - this.dataList.add("一种理想，就是一种力！"); - this.dataList.add("世上最快乐的事，莫过于为理想而奋斗。"); - this.dataList.add("为中华之崛起而读书。"); - this.dataList.add("活着又没有目标的人是可怕的。"); - this.dataList.add("哪里有天才，我是把别人喝咖啡的工夫都用在学习上的。"); - this.dataList.add("世上无难事，只要肯攀登。"); - this.dataList.add("灵感，是由于顽强的劳动而获得的奖赏。"); - this.dataList.add("人类要在竞争中生存，便要奋斗。"); - this.dataList.add("天才在于积累，聪明在于勤奋。"); - this.dataList.add("业精于勤，荒于嬉；行成于思，毁于随。"); - this.dataList.add("古人学问无遗力，少壮工夫老始成。"); - this.dataList.add("只要功夫深，铁杵磨成针。"); - this.dataList.add("苟有恒，何必三更起五更眠；最无益，只怕一日曝十日寒。"); - this.dataList.add("一日一钱，十日十钱。绳锯木断，水滴石穿。"); - this.dataList.add("最困难之时，就是离成功不远之日。"); - this.dataList.add("逆水行舟用力撑，一篙松劲退千寻。"); - this.dataList.add("鞠躬尽瘁，死而后已。"); - this.dataList.add("先天下之忧而忧，后天下之乐而乐。"); - this.dataList.add("人生价值，应该看他贡献什么，而不是取得什么。"); - this.dataList.add("只要人人都献出一点爱，世界将变成美好的人间。"); - this.dataList.add("太阳之所以伟大，在于它永远消耗自己。"); - this.dataList.add("春蚕到死丝方尽，蜡炬成挥泪始干。"); - this.dataList.add("落红不是无情物，化作春泥更护花。"); - this.dataList.add("横眉冷对千夫指，俯首甘为孺子牛。"); - this.dataList.add("老骥伏枥，志在千里；烈士暮年，壮心不已。"); - this.dataList.add("有志不在年高，无志空活百岁。"); - this.dataList.add("不想当元帅的士兵不是好士兵。"); - this.dataList.add("无目标而生活，犹如没有罗盘而航行。"); - this.dataList.add("将相本无种，男儿当自强。"); - this.dataList.add("万夫一力，天下无敌。"); - this.dataList.add("一个篱笆三个桩，一个好汉三个帮。"); - this.dataList.add("天时不如地利，地利不如人和。"); - this.dataList.add("君子可招而不可诱，可弃而不可诱。"); - this.dataList.add("不可自暴自弃自屈。"); - this.dataList.add("仰不愧于天，俯不怍（惭愧）于地。"); - this.dataList.add("人不可有傲气，但不可无傲骨。"); - this.dataList.add("知识是引导人们看到光明和真实境界的灯烛。"); - this.dataList.add("知识是人生旅途中的资粮。"); - this.dataList.add("明日之帝国将是智力之帝国。"); - this.dataList.add("没有知识就不可能对生活做出正确的解释。"); - this.dataList.add("人有多少知识，就有多少力量，他的知识和他的能力是相当的。"); - this.dataList.add("爱护书籍吧，它是知识的源泉。"); - this.dataList.add("书是世界宝贵财富，是国家和历史的优秀遗产。"); - this.dataList.add("读了一本书，就像对生活打开了一扇窗户。"); - this.dataList.add("读活书，活读书，读书活。"); - this.dataList.add("读书给人以乐趣，给人以光彩，给人以才干。"); - this.dataList.add("光阴给我们经验，读书给我们知识。"); - this.dataList.add("人无忠信，不可立于世。"); - this.dataList.add("言不信者，行不果。"); - this.dataList.add("丈夫一言许人，千金不易。"); - this.dataList.add("人生是花，而爱是花蜜。"); - this.dataList.add("积薄而为厚，聚少而为多。"); - this.dataList.add("不积跬步，无以至千里；不积小流，无以成江海。"); - this.dataList.add("千里始足下，高山起微尘，吾道亦如此，行之贵日新。"); - this.dataList.add("逆境是通往真理的第一条道路。"); - this.dataList.add("患难与困苦是磨练人格的最高学府。"); - this.dataList.add("逆水行舟，不进则退。"); - this.dataList.add("母爱是世间最伟大的力量。"); - this.dataList.add("母爱是一种巨大的火焰。"); - this.dataList.add("世界上有一种最美丽的声音，那便是母亲的呼唤。"); - this.dataList.add("母亲的心是一个深渊，在它的最深处你总会得到宽恕。"); - this.dataList.add("“我的第一个启蒙老师是我的母亲。”"); - this.dataList.add("一位好母亲抵得上一百个教师。"); - this.dataList.add("天下无不是的父母；世间最难得者兄弟。"); - this.dataList.add("人生自古谁无死，留取丹心照汗青。"); - this.dataList.add("先天下之忧而忧，后天下之乐而乐。"); - this.dataList.add("风声雨声读书声声声入耳；国事家事天下事事事关心。"); - this.dataList.add("捐躯赴国难，视死忽如归。"); - this.dataList.add("苟利国家生死以，岂因祸福避趋之。"); - this.dataList.add("恨不抗日死，留作今日羞。国破尚如此，我何惜此头。"); - this.dataList.add("我们爱我们的民族，这是我们自信心的泉源。"); - this.dataList.add("祖国如有难，汝应作前锋。"); - this.dataList.add("我是中国人民的儿子，我深深的爱着我的祖国和人民。"); - this.dataList.add("业精于勤，荒于嬉；行成于思，毁于随。"); - this.dataList.add("学而不思则罔，思而不学则殆。"); - this.dataList.add("知之者不如好之者，好之者不如乐之者。"); - this.dataList.add("三人行，必有我师也。择其善者而从之，其不善者而改之。"); - this.dataList.add("读书破万卷，下笔如有神。"); - this.dataList.add("读书有三到，谓心到，眼到，口到。"); - this.dataList.add("立身以立学为先，立学以读书为本。"); - this.dataList.add("黑发不知勤学早，白首方悔读书迟。"); - this.dataList.add("书卷多情似故人，晨昏忧乐每相亲。"); - this.dataList.add("书犹药也，善读之可以医愚。"); - this.dataList.add("少壮不努力，老大徒伤悲。"); - this.dataList.add("莫等闲，白了少年头，空悲切。"); - this.dataList.add("发奋识遍天下字，立志读尽人间书。"); - this.dataList.add("非淡泊无以明志，非宁静无以致远。"); - this.dataList.add("熟读唐诗三百首，不会作诗也会吟。"); - this.dataList.add("书到用时方恨少，事非经过不知难。"); - this.dataList.add("问渠那得清如许，为有源头活水来。"); - this.dataList.add("旧书不厌百回读，熟读精思子自知。"); - this.dataList.add("路漫漫其修道远，吾将上下而求索。"); - this.dataList.add("饭可以一日不吃，觉可以一日不睡，书不可以一日不读。"); - this.dataList.add("读过一本好书，像交了一个益友。"); - this.dataList.add("与肝胆人共事，从无字句处读书。"); - this.dataList.add("时间就像海绵里的水，只要愿挤，总还是有的。"); - this.dataList.add("千教万教教人求真，千学万学学做真人。"); - this.dataList.add("少年易学老难成，一寸光阴不可轻。"); - this.dataList.add("吾生也有涯，而知也无涯。"); - this.dataList.add("少壮不努力，老大徒伤悲。"); - this.dataList.add("时间就是生命，时间就是速度，时间就是力量。"); - this.dataList.add("莫等闲，白了少年头，空悲切。"); - this.dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); - this.dataList.add("一年之计在于春，一日之计在于晨。"); - this.dataList.add("时间就象海绵里的水一样，只要你愿挤，总还是有的"); - this.dataList.add("一年之计在于春，一日之计在于晨。"); - this.dataList.add("一寸光阴一寸金，寸金难买寸光阴。"); - this.dataList.add("朝霞不出门，晚霞行千里。"); - this.dataList.add("有雨山戴帽，无雨半山腰。"); - this.dataList.add("早晨下雨当日晴，晚上下雨到天明。"); - this.dataList.add("蚂蚁搬家蛇过道，大雨不久要来到。"); - this.dataList.add("平时肯帮人，急时有人帮。"); - this.dataList.add("与其锦上添花，不如雪中送炭。"); - this.dataList.add("灯不拨不亮，理不辩不明。"); - this.dataList.add("有理走遍天下，无理寸步难行。"); - this.dataList.add("一时强弱在于力，万古胜负在于理。"); - this.dataList.add("八月里来雁门开，雁儿脚上带霜来。"); - this.dataList.add("一场秋雨一场寒，十场秋雨要穿棉。"); - this.dataList.add("八月暖，九月温，十月还有小阳春。"); - this.dataList.add("听君一席话，胜读十年书。"); - this.dataList.add("路遥知马力，日久见人心。"); - this.dataList.add("近水知鱼性，近山识鸟音。"); - this.dataList.add("百闻不如一见，百见不如一干。"); - this.dataList.add("不当家，不知柴米贵；不生子，不知父母恩。"); - this.dataList.add("不摸锅底手不黑，不拿油瓶手不腻。"); - this.dataList.add("不挑担子不知重，不走长路不知远。"); - this.dataList.add("不下水，一辈子不会游泳；不扬帆，一辈子不会撑船。"); - this.dataList.add("不在被中睡，不知被儿宽。"); - this.dataList.add("菜没盐无味，话没理无力。"); - this.dataList.add("草遮不住鹰眼，水遮不住鱼眼。"); - this.dataList.add("吃人的嘴软，论人的理短。"); - this.dataList.add("船稳不怕风大，有理通行天下。"); - this.dataList.add("打柴问樵夫，驶船问艄公。"); - this.dataList.add("打铁的要自己把钳，种地的要自己下田。"); - this.dataList.add("当家才知盐米贵，出门才晓路难行。"); - this.dataList.add("稻多打出米，人多讲出理。"); - this.dataList.add("灯不拨不亮，理不辩不明。"); - this.dataList.add("灯不亮，要人拨；事不明，要人说。"); - this.dataList.add("多锉出快锯，多做长知识。"); - this.dataList.add("发回水，积层泥；经一事，长一智。"); - this.dataList.add("隔行如隔山，隔行不隔理。"); - this.dataList.add("鼓不敲不响，理不辩不明。"); - this.dataList.add("光说不练假把式，光练不说真把式，连说带练全把式。"); - this.dataList.add("好茶不怕细品，好事不怕细论。"); - this.dataList.add("好酒不怕酿，好人不怕讲。"); - this.dataList.add("湖里游着大鲤鱼，不如桌上小鲫鱼。"); - this.dataList.add("会走走不过影，会说说不过理。"); - this.dataList.add("脚跑不过雨，嘴强不过理。"); - this.dataList.add("经一番挫折，长一番见识。"); - this.dataList.add("井越掏，水越清；事越摆，理越明。"); - this.dataList.add("砍柴砍小头，问路问老头。"); - this.dataList.add("口说不如身到，耳闻不如目睹。"); - this.dataList.add("老姜辣味大，老人经验多。"); - this.dataList.add("老牛肉有嚼头，老人言有听头。"); - this.dataList.add("老人不讲古，后生会失谱。"); - this.dataList.add("力是压大的，胆是吓大的。"); - this.dataList.add("路不平，众人踩；事不平，大家管。"); - this.dataList.add("碾谷要碾出米来，说话要说出理来。"); - this.dataList.add("牛无力拖横耙，人无理说横话。"); - this.dataList.add("千学不如一看，千看不如一练。"); - this.dataList.add("人多出正理，谷多出好米。"); - this.dataList.add("人横有道理，马横有缰绳。"); - this.dataList.add("人心隔肚皮，看人看行为。"); - this.dataList.add("人行千里路，胜读十年书。"); - this.dataList.add("人在世上练，刀在石上磨。"); - this.dataList.add("认理不认人，帮理不帮亲。水大漫不过船，手大遮不住天。"); - this.dataList.add("认理不认人，不怕不了事。"); - this.dataList.add("三天不念口生，三年不做手生。"); - this.dataList.add("砂锅不捣不漏，木头不凿不通。"); - this.dataList.add("山是一步一步登上来的，船是一橹一橹摇出去的。"); - this.dataList.add("舌头是肉长的，事实是铁打的。"); - this.dataList.add("十年练得好文秀才，十年练不成田秀才。"); - this.dataList.add("是蛇一身冷，是狼一身腥。"); - this.dataList.add("树老半空心，人老百事通。"); - this.dataList.add("水不平要流，理不平要说。"); - this.dataList.add("水落现石头，日久见人心。"); - this.dataList.add("水退石头在，好人说不坏。"); - this.dataList.add("坛口封得住，人口封不住。"); - this.dataList.add("天上无云不下雨，世间无理事不成。"); - this.dataList.add("天下的弓都是弯的，世上的理都是直的。"); - this.dataList.add("万句言语吃不饱，一捧流水能解渴。"); - this.dataList.add("香花不一定好看，会说不一定能干。"); - this.dataList.add("药农进山见草药，猎人进山见禽兽。"); - this.dataList.add("要吃辣子栽辣秧，要吃鲤鱼走长江。"); - this.dataList.add("要知父母恩，怀里抱儿孙。"); - this.dataList.add("要知山中事，乡间问老农。"); - this.dataList.add("一等二靠三落空，一想二干三成功。"); - this.dataList.add("一人说话全有理，两人说话见高低。"); - this.dataList.add("一时强弱在于力，万古胜负在于理。"); - this.dataList.add("以势服人口，以理服人心。"); - this.dataList.add("有斧砍得树倒，有理说的不倒。"); - this.dataList.add("有理摆到事上，好钢使到刃上。"); - this.dataList.add("有理不可丢，无理不可争。"); - this.dataList.add("有理不怕势来压，人正不怕影子歪。"); - this.dataList.add("有理不在言高，有话说在面前。"); - this.dataList.add("有理的想着说，没理的抢着说。"); - this.dataList.add("有理走遍天下，无理寸步难行。"); - this.dataList.add("有志不在年高，有理不在会说。"); + dataList.add("一年之计在于春，一日之计在于晨。"); + dataList.add("一寸光阴一寸金，寸金难买寸光阴。"); + dataList.add("种瓜得瓜，种豆得豆。"); + dataList.add("前人栽树，后人乘凉。"); + dataList.add("千里之行，始于足下。"); + dataList.add("百尺竿头，更进一步。"); + dataList.add("朝霞不出门，晚霞行千里。"); + dataList.add("有雨山戴帽，无雨半山腰。"); + dataList.add("早晨下雨当日晴，晚上下雨到天明。"); + dataList.add("蚂蚁搬家蛇过道，大雨不久要来到。"); + dataList.add("不知则问，不能则学。"); + dataList.add("读书百遍，而义自见。"); + dataList.add("读万卷书，行万里路。"); + dataList.add("己所不欲，勿施于人。"); + dataList.add("与朋友交，言而有信。"); + dataList.add("不以规矩，不能成方圆。"); + dataList.add("有山皆图画，无水不文章。"); + dataList.add("白马西风塞上，杏花烟雨江南。"); + dataList.add("清风明月本无价，近水远山皆有情。"); + dataList.add("雾锁山头山锁雾，天连水尾水连天。"); + dataList.add("穷且益坚，不坠青云之志。"); + dataList.add("予人玫瑰，手有余香。"); + dataList.add("平时肯帮人，急时有人帮。"); + dataList.add("与其锦上添花，不如雪中送炭。"); + dataList.add("诚信者，天下之结也。"); + dataList.add("灯不拨不亮，理不辩不明。"); + dataList.add("有理走遍天下，无理寸步难行。"); + dataList.add("一时强弱在于力，万古胜负在于理。"); + dataList.add("二人同心，其利断金。"); + dataList.add("三个臭皮匠，顶个诸葛亮。"); + dataList.add("一个篱笆三个桩，一个好汉三个帮。"); + dataList.add("仁者爱人，有礼者敬人。"); + dataList.add("与人善言，暖于布帛；伤人以言，深于矛戟。"); + dataList.add("见善则迁，有过则改。"); + dataList.add("过而不改，是谓过矣。"); + dataList.add("人谁无过？过而能改，善莫大焉。"); + dataList.add("兵来将挡，水来土掩。"); + dataList.add("不入虎穴，焉得虎子。"); + dataList.add("眼见为实，耳听为虚。"); + dataList.add("近朱者赤，近墨者黑。"); + dataList.add("好问则裕，自用则小。"); + dataList.add("博学之，审问之，慎思之，明辨之，笃行之。"); + dataList.add("智能之士，不学不成，不问不知。"); + dataList.add("人非生而知之者，孰能无惑？"); + dataList.add("尺有所短，寸有所长。"); + dataList.add("机不可失，时不再来。"); + dataList.add("差之毫厘，谬以千里。"); + dataList.add("病从口入，祸从口出。"); + dataList.add("一言既出，驷马难追。"); + dataList.add("比上不足，比下有余。"); + dataList.add("诗和音乐一样，生命全在节奏。"); + dataList.add("天行健，君子以自强不息。"); + dataList.add("胜人者有力，自胜者强。"); + dataList.add("生于忧患而死于安乐。"); + dataList.add("少年不知勤学苦，老来方知读书迟。"); + dataList.add("一日读书一日功，一日不读十日空。"); + dataList.add("学习不怕根底浅，只要迈步总不迟。"); + dataList.add("书山有路勤为径，学海无涯苦作舟。"); + dataList.add("不饱食以终日，不弃功于寸阴。"); + dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); + dataList.add("莫等闲，白了少年头，空悲切。"); + dataList.add("多少事，从来急；天地转，光阴迫。一万年太久，只争朝夕。"); + dataList.add("克勤于邦，克俭于家。"); + dataList.add("居安思危，戒奢以俭。"); + dataList.add("由俭入奢易，由奢入俭难。"); + dataList.add("一粥一饭，当思来处不易；半丝半缕，恒念物力维艰。"); + dataList.add("君子喻于义，小人喻于利。"); + dataList.add("君子坦荡荡，小人长戚戚。"); + dataList.add("人有耻，则能有所不为。"); + dataList.add("捐躯赴国难，视死忽如归。"); + dataList.add("祖宗疆土，当以死守，不可以尺寸与人。"); + dataList.add("无情未必真豪杰，怜子如何不丈夫。"); + dataList.add("其实地上本没有路，走的人多了，也便成了路。"); + dataList.add("惟有民魂是值得宝贵的，惟有他发扬起来，中国才有真进步。"); + dataList.add("读书须用意，一字值千金。"); + dataList.add("莫道君行早，更有早行人。"); + dataList.add("听君一席话，胜读十年书。"); + dataList.add("路遥知马力，日久见人心。"); + dataList.add("近水知鱼性，近山识鸟音。"); + dataList.add("有意栽花花不发，无心插柳柳成荫。"); + dataList.add("良药苦口利于病，忠言逆耳利于行。"); + dataList.add("树欲静而风不止，子欲养而亲不待。"); + dataList.add("常将有日思无日，莫把无时当有时。"); + dataList.add("书到用时方恨少，事非经过不知难。"); + dataList.add("穷则变，变则通，通则久。"); + dataList.add("苟日新，日日新，又日新。"); + dataList.add("青，取之于蓝，而青于蓝。"); + dataList.add("苟利于民，不必法古；苟周于事，不必循旧。"); + dataList.add("不知则问，不能则学。"); + dataList.add("读书百遍，而义自见。"); + dataList.add("读万卷书，行万里路。"); + dataList.add("己所不欲，勿施于人。"); + dataList.add("与朋友交，言而有信。"); + dataList.add("不以规矩，不能成方圆。"); + dataList.add("穷且益坚，不坠青云之志。"); + dataList.add("诚信者，天下之结也。"); + dataList.add("仁者爱人，有礼者敬人。"); + dataList.add("与人善言，暖于布帛；伤人以言，深于矛戟。"); + dataList.add("见善则迁，有过则改。"); + dataList.add("过而不改，是谓过矣。"); + dataList.add("人谁无过？过而能改，善莫大焉。"); + dataList.add("好问则裕，自用则小。"); + dataList.add("博学之，审问之，慎思之，明辨之，笃行之。"); + dataList.add("智能之士，不学不成，不问不知。"); + dataList.add("人非生而知之者，孰能无惑？"); + dataList.add("诗和音乐一样，生命全在节奏。"); + dataList.add("诗是人类向未来寄发的信息，诗给人类以朝向理想的勇气。"); + dataList.add("诗是强烈感情的自然流露，它源于宁静中回忆起来的情感。"); + dataList.add("天行健，君子以自强不息。"); + dataList.add("胜人者有力，自胜者强。"); + dataList.add("生于忧患而死于安乐。"); + dataList.add("少年不知勤学苦，老来方知读书迟。"); + dataList.add("一日读书一日功，一日不读十日空。"); + dataList.add("学习不怕根底浅，只要迈步总不迟。"); + dataList.add("书山有路勤为径，学海无涯苦作舟。"); + dataList.add("不饱食以终日，不弃功于寸阴。"); + dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); + dataList.add("莫等闲，白了少年头，空悲切。"); + dataList.add("多少事，从来急；天地转，光阴迫。一万年太久，只争朝夕。"); + dataList.add("克勤于邦，克俭于家。"); + dataList.add("居安思危，戒奢以俭。"); + dataList.add("由俭入奢易，由奢入俭难。"); + dataList.add("一粥一饭，当思来处不易；半丝半缕，恒念物力维艰。"); + dataList.add("君子喻于义，小人喻于利。"); + dataList.add("君子坦荡荡，小人长戚戚。"); + dataList.add("恻隐之心，仁之端也。"); + dataList.add("人有耻，则能有所不为。"); + dataList.add("捐躯赴国难，视死忽如归。"); + dataList.add("祖宗疆土，当以死守，不可以尺寸与人。"); + dataList.add("无情未必真豪杰，怜子如何不丈夫。"); + dataList.add("其实地上本没有路，走的人多了，也便成了路。"); + dataList.add("惟有民魂是值得宝贵的，惟有他发扬起来，中国才有真进步。"); + dataList.add("读书须用意，一字值千金。"); + dataList.add("莫道君行早，更有早行人。"); + dataList.add("穷则变，变则通，通则久。"); + dataList.add("苟日新，日日新，又日新。"); + dataList.add("青，取之于蓝，而青于蓝。"); + dataList.add("苟利于民，不必法古；苟周于事，不必循旧。"); + dataList.add("一种理想，就是一种力！"); + dataList.add("世上最快乐的事，莫过于为理想而奋斗。"); + dataList.add("为中华之崛起而读书。"); + dataList.add("活着又没有目标的人是可怕的。"); + dataList.add("哪里有天才，我是把别人喝咖啡的工夫都用在学习上的。"); + dataList.add("世上无难事，只要肯攀登。"); + dataList.add("灵感，是由于顽强的劳动而获得的奖赏。"); + dataList.add("人类要在竞争中生存，便要奋斗。"); + dataList.add("天才在于积累，聪明在于勤奋。"); + dataList.add("业精于勤，荒于嬉；行成于思，毁于随。"); + dataList.add("古人学问无遗力，少壮工夫老始成。"); + dataList.add("只要功夫深，铁杵磨成针。"); + dataList.add("苟有恒，何必三更起五更眠；最无益，只怕一日曝十日寒。"); + dataList.add("一日一钱，十日十钱。绳锯木断，水滴石穿。"); + dataList.add("最困难之时，就是离成功不远之日。"); + dataList.add("逆水行舟用力撑，一篙松劲退千寻。"); + dataList.add("鞠躬尽瘁，死而后已。"); + dataList.add("先天下之忧而忧，后天下之乐而乐。"); + dataList.add("人生价值，应该看他贡献什么，而不是取得什么。"); + dataList.add("只要人人都献出一点爱，世界将变成美好的人间。"); + dataList.add("太阳之所以伟大，在于它永远消耗自己。"); + dataList.add("春蚕到死丝方尽，蜡炬成挥泪始干。"); + dataList.add("落红不是无情物，化作春泥更护花。"); + dataList.add("横眉冷对千夫指，俯首甘为孺子牛。"); + dataList.add("老骥伏枥，志在千里；烈士暮年，壮心不已。"); + dataList.add("有志不在年高，无志空活百岁。"); + dataList.add("不想当元帅的士兵不是好士兵。"); + dataList.add("无目标而生活，犹如没有罗盘而航行。"); + dataList.add("将相本无种，男儿当自强。"); + dataList.add("万夫一力，天下无敌。"); + dataList.add("一个篱笆三个桩，一个好汉三个帮。"); + dataList.add("天时不如地利，地利不如人和。"); + dataList.add("君子可招而不可诱，可弃而不可诱。"); + dataList.add("不可自暴自弃自屈。"); + dataList.add("仰不愧于天，俯不怍（惭愧）于地。"); + dataList.add("人不可有傲气，但不可无傲骨。"); + dataList.add("知识是引导人们看到光明和真实境界的灯烛。"); + dataList.add("知识是人生旅途中的资粮。"); + dataList.add("明日之帝国将是智力之帝国。"); + dataList.add("没有知识就不可能对生活做出正确的解释。"); + dataList.add("人有多少知识，就有多少力量，他的知识和他的能力是相当的。"); + dataList.add("爱护书籍吧，它是知识的源泉。"); + dataList.add("书是世界宝贵财富，是国家和历史的优秀遗产。"); + dataList.add("读了一本书，就像对生活打开了一扇窗户。"); + dataList.add("读活书，活读书，读书活。"); + dataList.add("读书给人以乐趣，给人以光彩，给人以才干。"); + dataList.add("光阴给我们经验，读书给我们知识。"); + dataList.add("人无忠信，不可立于世。"); + dataList.add("言不信者，行不果。"); + dataList.add("丈夫一言许人，千金不易。"); + dataList.add("人生是花，而爱是花蜜。"); + dataList.add("积薄而为厚，聚少而为多。"); + dataList.add("不积跬步，无以至千里；不积小流，无以成江海。"); + dataList.add("千里始足下，高山起微尘，吾道亦如此，行之贵日新。"); + dataList.add("逆境是通往真理的第一条道路。"); + dataList.add("患难与困苦是磨练人格的最高学府。"); + dataList.add("逆水行舟，不进则退。"); + dataList.add("母爱是世间最伟大的力量。"); + dataList.add("母爱是一种巨大的火焰。"); + dataList.add("世界上有一种最美丽的声音，那便是母亲的呼唤。"); + dataList.add("母亲的心是一个深渊，在它的最深处你总会得到宽恕。"); + dataList.add("“我的第一个启蒙老师是我的母亲。”"); + dataList.add("一位好母亲抵得上一百个教师。"); + dataList.add("天下无不是的父母；世间最难得者兄弟。"); + dataList.add("人生自古谁无死，留取丹心照汗青。"); + dataList.add("先天下之忧而忧，后天下之乐而乐。"); + dataList.add("风声雨声读书声声声入耳；国事家事天下事事事关心。"); + dataList.add("捐躯赴国难，视死忽如归。"); + dataList.add("苟利国家生死以，岂因祸福避趋之。"); + dataList.add("恨不抗日死，留作今日羞。国破尚如此，我何惜此头。"); + dataList.add("我们爱我们的民族，这是我们自信心的泉源。"); + dataList.add("祖国如有难，汝应作前锋。"); + dataList.add("我是中国人民的儿子，我深深的爱着我的祖国和人民。"); + dataList.add("业精于勤，荒于嬉；行成于思，毁于随。"); + dataList.add("学而不思则罔，思而不学则殆。"); + dataList.add("知之者不如好之者，好之者不如乐之者。"); + dataList.add("三人行，必有我师也。择其善者而从之，其不善者而改之。"); + dataList.add("读书破万卷，下笔如有神。"); + dataList.add("读书有三到，谓心到，眼到，口到。"); + dataList.add("立身以立学为先，立学以读书为本。"); + dataList.add("黑发不知勤学早，白首方悔读书迟。"); + dataList.add("书卷多情似故人，晨昏忧乐每相亲。"); + dataList.add("书犹药也，善读之可以医愚。"); + dataList.add("少壮不努力，老大徒伤悲。"); + dataList.add("莫等闲，白了少年头，空悲切。"); + dataList.add("发奋识遍天下字，立志读尽人间书。"); + dataList.add("非淡泊无以明志，非宁静无以致远。"); + dataList.add("熟读唐诗三百首，不会作诗也会吟。"); + dataList.add("书到用时方恨少，事非经过不知难。"); + dataList.add("问渠那得清如许，为有源头活水来。"); + dataList.add("旧书不厌百回读，熟读精思子自知。"); + dataList.add("路漫漫其修道远，吾将上下而求索。"); + dataList.add("饭可以一日不吃，觉可以一日不睡，书不可以一日不读。"); + dataList.add("读过一本好书，像交了一个益友。"); + dataList.add("与肝胆人共事，从无字句处读书。"); + dataList.add("时间就像海绵里的水，只要愿挤，总还是有的。"); + dataList.add("千教万教教人求真，千学万学学做真人。"); + dataList.add("少年易学老难成，一寸光阴不可轻。"); + dataList.add("吾生也有涯，而知也无涯。"); + dataList.add("少壮不努力，老大徒伤悲。"); + dataList.add("时间就是生命，时间就是速度，时间就是力量。"); + dataList.add("莫等闲，白了少年头，空悲切。"); + dataList.add("盛年不重来，一日难再晨。及时当勉励，岁月不待人。"); + dataList.add("一年之计在于春，一日之计在于晨。"); + dataList.add("时间就象海绵里的水一样，只要你愿挤，总还是有的"); + dataList.add("一年之计在于春，一日之计在于晨。"); + dataList.add("一寸光阴一寸金，寸金难买寸光阴。"); + dataList.add("朝霞不出门，晚霞行千里。"); + dataList.add("有雨山戴帽，无雨半山腰。"); + dataList.add("早晨下雨当日晴，晚上下雨到天明。"); + dataList.add("蚂蚁搬家蛇过道，大雨不久要来到。"); + dataList.add("平时肯帮人，急时有人帮。"); + dataList.add("与其锦上添花，不如雪中送炭。"); + dataList.add("灯不拨不亮，理不辩不明。"); + dataList.add("有理走遍天下，无理寸步难行。"); + dataList.add("一时强弱在于力，万古胜负在于理。"); + dataList.add("八月里来雁门开，雁儿脚上带霜来。"); + dataList.add("一场秋雨一场寒，十场秋雨要穿棉。"); + dataList.add("八月暖，九月温，十月还有小阳春。"); + dataList.add("听君一席话，胜读十年书。"); + dataList.add("路遥知马力，日久见人心。"); + dataList.add("近水知鱼性，近山识鸟音。"); + dataList.add("百闻不如一见，百见不如一干。"); + dataList.add("不当家，不知柴米贵；不生子，不知父母恩。"); + dataList.add("不摸锅底手不黑，不拿油瓶手不腻。"); + dataList.add("不挑担子不知重，不走长路不知远。"); + dataList.add("不下水，一辈子不会游泳；不扬帆，一辈子不会撑船。"); + dataList.add("不在被中睡，不知被儿宽。"); + dataList.add("菜没盐无味，话没理无力。"); + dataList.add("草遮不住鹰眼，水遮不住鱼眼。"); + dataList.add("吃人的嘴软，论人的理短。"); + dataList.add("船稳不怕风大，有理通行天下。"); + dataList.add("打柴问樵夫，驶船问艄公。"); + dataList.add("打铁的要自己把钳，种地的要自己下田。"); + dataList.add("当家才知盐米贵，出门才晓路难行。"); + dataList.add("稻多打出米，人多讲出理。"); + dataList.add("灯不拨不亮，理不辩不明。"); + dataList.add("灯不亮，要人拨；事不明，要人说。"); + dataList.add("多锉出快锯，多做长知识。"); + dataList.add("发回水，积层泥；经一事，长一智。"); + dataList.add("隔行如隔山，隔行不隔理。"); + dataList.add("鼓不敲不响，理不辩不明。"); + dataList.add("光说不练假把式，光练不说真把式，连说带练全把式。"); + dataList.add("好茶不怕细品，好事不怕细论。"); + dataList.add("好酒不怕酿，好人不怕讲。"); + dataList.add("湖里游着大鲤鱼，不如桌上小鲫鱼。"); + dataList.add("会走走不过影，会说说不过理。"); + dataList.add("脚跑不过雨，嘴强不过理。"); + dataList.add("经一番挫折，长一番见识。"); + dataList.add("井越掏，水越清；事越摆，理越明。"); + dataList.add("砍柴砍小头，问路问老头。"); + dataList.add("口说不如身到，耳闻不如目睹。"); + dataList.add("老姜辣味大，老人经验多。"); + dataList.add("老牛肉有嚼头，老人言有听头。"); + dataList.add("老人不讲古，后生会失谱。"); + dataList.add("力是压大的，胆是吓大的。"); + dataList.add("路不平，众人踩；事不平，大家管。"); + dataList.add("碾谷要碾出米来，说话要说出理来。"); + dataList.add("牛无力拖横耙，人无理说横话。"); + dataList.add("千学不如一看，千看不如一练。"); + dataList.add("人多出正理，谷多出好米。"); + dataList.add("人横有道理，马横有缰绳。"); + dataList.add("人心隔肚皮，看人看行为。"); + dataList.add("人行千里路，胜读十年书。"); + dataList.add("人在世上练，刀在石上磨。"); + dataList.add("认理不认人，帮理不帮亲。水大漫不过船，手大遮不住天。"); + dataList.add("认理不认人，不怕不了事。"); + dataList.add("三天不念口生，三年不做手生。"); + dataList.add("砂锅不捣不漏，木头不凿不通。"); + dataList.add("山是一步一步登上来的，船是一橹一橹摇出去的。"); + dataList.add("舌头是肉长的，事实是铁打的。"); + dataList.add("十年练得好文秀才，十年练不成田秀才。"); + dataList.add("是蛇一身冷，是狼一身腥。"); + dataList.add("树老半空心，人老百事通。"); + dataList.add("水不平要流，理不平要说。"); + dataList.add("水落现石头，日久见人心。"); + dataList.add("水退石头在，好人说不坏。"); + dataList.add("坛口封得住，人口封不住。"); + dataList.add("天上无云不下雨，世间无理事不成。"); + dataList.add("天下的弓都是弯的，世上的理都是直的。"); + dataList.add("万句言语吃不饱，一捧流水能解渴。"); + dataList.add("香花不一定好看，会说不一定能干。"); + dataList.add("药农进山见草药，猎人进山见禽兽。"); + dataList.add("要吃辣子栽辣秧，要吃鲤鱼走长江。"); + dataList.add("要知父母恩，怀里抱儿孙。"); + dataList.add("要知山中事，乡间问老农。"); + dataList.add("一等二靠三落空，一想二干三成功。"); + dataList.add("一人说话全有理，两人说话见高低。"); + dataList.add("一时强弱在于力，万古胜负在于理。"); + dataList.add("以势服人口，以理服人心。"); + dataList.add("有斧砍得树倒，有理说的不倒。"); + dataList.add("有理摆到事上，好钢使到刃上。"); + dataList.add("有理不可丢，无理不可争。"); + dataList.add("有理不怕势来压，人正不怕影子歪。"); + dataList.add("有理不在言高，有话说在面前。"); + dataList.add("有理的想着说，没理的抢着说。"); + dataList.add("有理走遍天下，无理寸步难行。"); + dataList.add("有志不在年高，有理不在会说。"); } public void playSound() { try { - AssetFileDescriptor openFd = this.mContext.getAssets().openFd(this.PREPARE_START_MH_SOUND_PATH); - this.mPlayer.reset(); - this.mPlayer.setDataSource(openFd.getFileDescriptor(), openFd.getStartOffset(), openFd.getLength()); - this.mPlayer.prepare(); - this.mPlayer.start(); + AssetFileDescriptor openFd = mContext.getAssets().openFd(PREPARE_START_MH_SOUND_PATH); + mPlayer.reset(); + mPlayer.setDataSource(openFd.getFileDescriptor(), openFd.getStartOffset(), openFd.getLength()); + mPlayer.prepare(); + mPlayer.start(); } catch (Exception e) { e.printStackTrace(); } } private void showJS(View view) { - View inflate = this.activity.getLayoutInflater().inflate(R.layout.layout_jiesao, (ViewGroup) null); - this.pop_js = new PopupWindow(inflate, -2, -2, true); - this.dsdv0 = inflate.findViewById(R.id.dsdv0); - this.dsdv1 = inflate.findViewById(R.id.dsdv1); - this.dsdv2 = inflate.findViewById(R.id.dsdv2); - this.dsdv3 = inflate.findViewById(R.id.dsdv3); - this.dsdv4 = inflate.findViewById(R.id.dsdv4); - this.dsdv5 = inflate.findViewById(R.id.dsdv5); - this.dsdv6 = inflate.findViewById(R.id.dsdv6); - this.dsdv7 = inflate.findViewById(R.id.dsdv7); - this.dsdv8 = inflate.findViewById(R.id.dsdv8); - this.dsdv9 = inflate.findViewById(R.id.dsdv9); - this.dsdv10 = inflate.findViewById(R.id.dsdv10); - this.dsdv0.setdj(this.current_dj); - this.dsdv1.setdj(this.current_dj); - this.dsdv2.setdj(this.current_dj); - this.dsdv3.setdj(this.current_dj); - this.dsdv4.setdj(this.current_dj); - this.dsdv5.setdj(this.current_dj); - this.dsdv6.setdj(this.current_dj); - this.dsdv7.setdj(this.current_dj); - this.dsdv8.setdj(this.current_dj); - this.dsdv9.setdj(this.current_dj); - this.dsdv10.setdj(this.current_dj); - WindowManager.LayoutParams attributes = this.activity.getWindow().getAttributes(); + View inflate = activity.getLayoutInflater().inflate(R.layout.layout_jiesao, null); + pop_js = new PopupWindow(inflate, -2, -2, true); + dsdv0 = inflate.findViewById(R.id.dsdv0); + dsdv1 = inflate.findViewById(R.id.dsdv1); + dsdv2 = inflate.findViewById(R.id.dsdv2); + dsdv3 = inflate.findViewById(R.id.dsdv3); + dsdv4 = inflate.findViewById(R.id.dsdv4); + dsdv5 = inflate.findViewById(R.id.dsdv5); + dsdv6 = inflate.findViewById(R.id.dsdv6); + dsdv7 = inflate.findViewById(R.id.dsdv7); + dsdv8 = inflate.findViewById(R.id.dsdv8); + dsdv9 = inflate.findViewById(R.id.dsdv9); + dsdv10 = inflate.findViewById(R.id.dsdv10); + dsdv0.setdj(current_dj); + dsdv1.setdj(current_dj); + dsdv2.setdj(current_dj); + dsdv3.setdj(current_dj); + dsdv4.setdj(current_dj); + dsdv5.setdj(current_dj); + dsdv6.setdj(current_dj); + dsdv7.setdj(current_dj); + dsdv8.setdj(current_dj); + dsdv9.setdj(current_dj); + dsdv10.setdj(current_dj); + WindowManager.LayoutParams attributes = activity.getWindow().getAttributes(); attributes.alpha = 0.5f; - this.activity.getWindow().addFlags(2); - this.activity.getWindow().setAttributes(attributes); - this.pop_js.setOnDismissListener(new PopupWindow.OnDismissListener() { + activity.getWindow().addFlags(2); + activity.getWindow().setAttributes(attributes); + pop_js.setOnDismissListener(new PopupWindow.OnDismissListener() { @Override public void onDismiss() { - WindowManager.LayoutParams attributes2 = TreeView.this.activity.getWindow().getAttributes(); + WindowManager.LayoutParams attributes2 = activity.getWindow().getAttributes(); attributes2.alpha = 1.0f; - TreeView.this.activity.getWindow().setAttributes(attributes2); + activity.getWindow().setAttributes(attributes2); } }); - view.getLocationOnScreen(this.location); - this.pop_js.setBackgroundDrawable(new BitmapDrawable()); - this.pop_js.showAtLocation(view, 48, getResources().getDimensionPixelSize(R.dimen.x719) / 2, this.location[1] - getResources().getDimensionPixelSize(R.dimen.x783)); + view.getLocationOnScreen(location); + pop_js.setBackgroundDrawable(new BitmapDrawable()); + pop_js.showAtLocation(view, 48, getResources().getDimensionPixelSize(R.dimen.x719) / 2, location[1] - getResources().getDimensionPixelSize(R.dimen.x783)); } public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.listener = onItemClickListener; + listener = onItemClickListener; } } \ No newline at end of file diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/WaterR.java b/app/src/main/java/com/xwad/os/view/jxw/widget/WaterR.java index dd473dc..1c5c6ab 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/WaterR.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/WaterR.java @@ -29,35 +29,35 @@ public class WaterR extends RelativeLayout { } public void setChildPosition(int i, int i2) { - this.listX.add(Integer.valueOf(i)); - this.listY.add(Integer.valueOf(i2)); + listX.add(i); + listY.add(i2); } public WaterR(Context context) { super(context); - this.listX = new ArrayList(); - this.listY = new ArrayList(); - this.isR = true; - this.isCollect = false; + listX = new ArrayList<>(); + listY = new ArrayList<>(); + isR = true; + isCollect = false; } public WaterR(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.listX = new ArrayList(); - this.listY = new ArrayList(); - this.isR = true; - this.isCollect = false; + listX = new ArrayList<>(); + listY = new ArrayList<>(); + isR = true; + isCollect = false; } public WaterR(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.listX = new ArrayList(); - this.listY = new ArrayList(); - this.isR = true; - this.isCollect = false; + listX = new ArrayList<>(); + listY = new ArrayList<>(); + isR = true; + isCollect = false; } - @Override // android.widget.RelativeLayout, android.view.View + @Override protected void onMeasure(int i, int i2) { super.onMeasure(i, i2); measureChildren(i, i2); @@ -71,12 +71,12 @@ public class WaterR extends RelativeLayout { Rect rect = new Rect(); for (int i = 0; i < getChildCount(); i++) { getChildAt(i).getHitRect(rect); - if (rect.contains(x, y) && this.mOnWaterItemListener != null) { - if (this.isCollect) { + if (rect.contains(x, y) && mOnWaterItemListener != null) { + if (isCollect) { return true; } getChildAt(i).performClick(); - this.mOnWaterItemListener.onItemClick(((WaterView) getChildAt(i)).getTaskBean()); + mOnWaterItemListener.onItemClick(((WaterView) getChildAt(i)).getTaskBean()); startAnimator(getChildAt(i)); Log.e("zsj", "-----------经验球" + i); return true; @@ -87,10 +87,10 @@ public class WaterR extends RelativeLayout { } private void startAnimator(final View view) { - if (this.isCollect) { + if (isCollect) { return; } - this.isCollect = true; + isCollect = true; ObjectAnimator ofFloat = ObjectAnimator.ofFloat(view, "translationY", 100.0f); ofFloat.start(); ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(view, "alpha", 1.0f, 0.0f); @@ -99,38 +99,37 @@ public class WaterR extends RelativeLayout { animatorSet.play(ofFloat).with(ofFloat2); animatorSet.setDuration(1500L); animatorSet.start(); - animatorSet.addListener(new AnimatorListenerAdapter() { // from class: com.jxw.launcher.widget.WaterR.1 - @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener + animatorSet.addListener(new AnimatorListenerAdapter() { + @Override public void onAnimationEnd(Animator animator) { - WaterR.this.removeViewInLayout(view); + removeViewInLayout(view); view.setVisibility(View.GONE); - WaterR waterR = WaterR.this; - waterR.isR = false; - waterR.isCollect = false; + isR = false; + isCollect = false; } }); } - @Override // android.widget.RelativeLayout, android.view.ViewGroup, android.view.View + @Override protected void onLayout(boolean z, int i, int i2, int i3, int i4) { - if (this.isR) { + if (isR) { int childCount = getChildCount(); for (int i5 = 0; i5 < childCount; i5++) { View childAt = getChildAt(i5); int measuredWidth = childAt.getMeasuredWidth(); int measuredHeight = childAt.getMeasuredHeight(); if (childAt.getVisibility() != 8) { - childAt.layout(((Integer) this.listX.get(i5)).intValue(), ((Integer) this.listY.get(i5)).intValue(), measuredWidth + ((Integer) this.listX.get(i5)).intValue(), measuredHeight + ((Integer) this.listY.get(i5)).intValue()); + childAt.layout(listX.get(i5), listY.get(i5), measuredWidth + listX.get(i5), measuredHeight + listY.get(i5)); } } } } private void doSetAnim(View view) { - if (this.isCollect) { + if (isCollect) { return; } - this.isCollect = true; + isCollect = true; ObjectAnimator ofFloat = ObjectAnimator.ofFloat(view, "translationX", 0.0f, 0.0f); ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(view, "translationY", 0.0f, 0.0f); ObjectAnimator ofFloat3 = ObjectAnimator.ofFloat(view, "alpha", 1.0f, 0.0f); @@ -141,7 +140,7 @@ public class WaterR extends RelativeLayout { } public void setOnWaterItemListener(OnWaterItemListener onWaterItemListener) { - this.mOnWaterItemListener = onWaterItemListener; + mOnWaterItemListener = onWaterItemListener; } @Override diff --git a/app/src/main/java/com/xwad/os/view/jxw/widget/WaterView.java b/app/src/main/java/com/xwad/os/view/jxw/widget/WaterView.java index 3fbf2ab..ed41d22 100644 --- a/app/src/main/java/com/xwad/os/view/jxw/widget/WaterView.java +++ b/app/src/main/java/com/xwad/os/view/jxw/widget/WaterView.java @@ -24,68 +24,68 @@ public class WaterView extends LinearLayout { public WaterView(Context context, TaskBean taskBean) { super(context); - this.strokeWidth = 0.5f; - this.mRadius = getResources().getDimensionPixelSize(R.dimen.x50); - this.expBean = taskBean; + strokeWidth = 0.5f; + mRadius = getResources().getDimensionPixelSize(R.dimen.x50); + expBean = taskBean; init(); } public WaterView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - this.strokeWidth = 0.5f; - this.mRadius = getResources().getDimensionPixelSize(R.dimen.x50); + strokeWidth = 0.5f; + mRadius = getResources().getDimensionPixelSize(R.dimen.x50); init(); } public WaterView(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); - this.strokeWidth = 0.5f; - this.mRadius = getResources().getDimensionPixelSize(R.dimen.x50); + strokeWidth = 0.5f; + mRadius = getResources().getDimensionPixelSize(R.dimen.x50); init(); } public TaskBean getTaskBean() { - return this.expBean; + return expBean; } private void init() { - this.paint = new Paint(); - this.paint.setAntiAlias(true); + paint = new Paint(); + paint.setAntiAlias(true); View inflate = View.inflate(getContext(), R.layout.item_exp, null); - ((TextView) inflate.findViewById(R.id.tv_title)).setText(this.expBean.getModuleName()); - ((TextView) inflate.findViewById(R.id.tv_exp)).setText(this.expBean.getExperience()); + ((TextView) inflate.findViewById(R.id.tv_title)).setText(expBean.getModuleName()); + ((TextView) inflate.findViewById(R.id.tv_exp)).setText(expBean.getExperience()); addView(inflate); } - @Override // android.view.View + @Override public void draw(Canvas canvas) { super.draw(canvas); } - @Override // android.widget.LinearLayout, android.view.View + @Override protected void onMeasure(int i, int i2) { super.onMeasure(i, i2); - setMeasuredDimension(dp2px((int) ((this.mRadius + this.strokeWidth) * 2.0f)), dp2px((int) ((this.mRadius + this.strokeWidth) * 2.0f))); + setMeasuredDimension(dp2px((int) ((mRadius + strokeWidth) * 2.0f)), dp2px((int) ((mRadius + strokeWidth) * 2.0f))); } public void setmRadius(int i) { - this.mRadius = i; + mRadius = i; invalidate(); } - @Override // android.view.ViewGroup, android.view.View + @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); start(); } - @Override // android.view.ViewGroup, android.view.View + @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); stop(); } - @Override // android.view.View + @Override protected void onVisibilityChanged(View view, int i) { super.onVisibilityChanged(view, i); if (i == 0) { @@ -96,34 +96,35 @@ public class WaterView extends LinearLayout { } public void start() { - ObjectAnimator objectAnimator = this.mAnimator; + ObjectAnimator objectAnimator = mAnimator; if (objectAnimator == null) { - this.mAnimator = ObjectAnimator.ofFloat(this, "translationY", -6.0f, 6.0f, -6.0f); - this.mAnimator.setDuration(3500L); - this.mAnimator.setInterpolator(new LinearInterpolator()); - this.mAnimator.setRepeatMode(1); - this.mAnimator.setRepeatCount(-1); - this.mAnimator.start(); + mAnimator = ObjectAnimator.ofFloat(this, "translationY", -6.0f, 6.0f, -6.0f); + mAnimator.setDuration(3500L); + mAnimator.setInterpolator(new LinearInterpolator()); + mAnimator.setRepeatMode(1); + mAnimator.setRepeatCount(-1); + mAnimator.start(); } else if (objectAnimator.isStarted()) { + } else { - this.mAnimator.start(); + mAnimator.start(); } } public void stop() { - ObjectAnimator objectAnimator = this.mAnimator; + ObjectAnimator objectAnimator = mAnimator; if (objectAnimator != null) { objectAnimator.cancel(); - this.mAnimator = null; + mAnimator = null; } } public float getProportion() { - return this.proportion; + return proportion; } public void setProportion(float f) { - this.proportion = f; + proportion = f; } public static int dp2px(float f) { diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth_connect.png b/app/src/main/res/drawable-hdpi/ic_bluetooth_connect.png new file mode 100644 index 0000000..49eec1d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_bluetooth_connect.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth_open.png b/app/src/main/res/drawable-hdpi/ic_bluetooth_open.png new file mode 100644 index 0000000..b83a088 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_bluetooth_open.png differ diff --git a/app/src/main/res/drawable-hdpi/xuewang_logo_ai.png b/app/src/main/res/drawable-hdpi/xuewang_logo_ai.png new file mode 100644 index 0000000..28dec29 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/xuewang_logo_ai.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ai_aijt.png b/app/src/main/res/drawable-nodpi/icon_ai_aijt.png index bd655bb..66af760 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ai_aijt.png and b/app/src/main/res/drawable-nodpi/icon_ai_aijt.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ai_aijtjs.png b/app/src/main/res/drawable-nodpi/icon_ai_aijtjs.png index 9d1b0e5..e9e0f4f 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ai_aijtjs.png and b/app/src/main/res/drawable-nodpi/icon_ai_aijtjs.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ai_aixhb.png b/app/src/main/res/drawable-nodpi/icon_ai_aixhb.png index 45b49fa..ed59976 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ai_aixhb.png and b/app/src/main/res/drawable-nodpi/icon_ai_aixhb.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_ai_kyls.png b/app/src/main/res/drawable-nodpi/icon_ai_kyls.png index 2ced3ce..dc4d411 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_ai_kyls.png and b/app/src/main/res/drawable-nodpi/icon_ai_kyls.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png b/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png index cca00d1..e59c329 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png and b/app/src/main/res/drawable-nodpi/icon_xk_wl_khl.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_yw_aidyfxl_bg.png b/app/src/main/res/drawable-nodpi/icon_yw_aidyfxl_bg.png index 34a91e4..ae113a0 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_yw_aidyfxl_bg.png and b/app/src/main/res/drawable-nodpi/icon_yw_aidyfxl_bg.png differ diff --git a/app/src/main/res/drawable-nodpi/icon_yw_brdzj.png b/app/src/main/res/drawable-nodpi/icon_yw_brdzj.png index 4d20893..081e0e5 100644 Binary files a/app/src/main/res/drawable-nodpi/icon_yw_brdzj.png and b/app/src/main/res/drawable-nodpi/icon_yw_brdzj.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth_connect.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth_connect.png new file mode 100644 index 0000000..2b6f5a0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_bluetooth_connect.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth_open.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth_open.png new file mode 100644 index 0000000..2a9fba2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_bluetooth_open.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connect.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connect.png new file mode 100644 index 0000000..30bea40 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_connect.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth_open.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_open.png new file mode 100644 index 0000000..555d41e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_open.png differ diff --git a/app/src/main/res/drawable/bg_shape_diglog_btn_right.xml b/app/src/main/res/drawable/bg_shape_diglog_btn_right.xml new file mode 100644 index 0000000..dc86a73 --- /dev/null +++ b/app/src/main/res/drawable/bg_shape_diglog_btn_right.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/download_cancel_bg.xml b/app/src/main/res/drawable/download_cancel_bg.xml new file mode 100644 index 0000000..048b589 --- /dev/null +++ b/app/src/main/res/drawable/download_cancel_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/download_remove_bg.xml b/app/src/main/res/drawable/download_remove_bg.xml new file mode 100644 index 0000000..00d2811 --- /dev/null +++ b/app/src/main/res/drawable/download_remove_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/grzx_bg.xml b/app/src/main/res/drawable/grzx_bg.xml new file mode 100644 index 0000000..d2a502a --- /dev/null +++ b/app/src/main/res/drawable/grzx_bg.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/jingyong_bg.xml b/app/src/main/res/drawable/jingyong_bg.xml new file mode 100644 index 0000000..a33dfea --- /dev/null +++ b/app/src/main/res/drawable/jingyong_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/new_bg.xml b/app/src/main/res/drawable/new_bg.xml new file mode 100644 index 0000000..a4d5c64 --- /dev/null +++ b/app/src/main/res/drawable/new_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/xzsy_bg.xml b/app/src/main/res/drawable/xzsy_bg.xml new file mode 100644 index 0000000..761ad4c --- /dev/null +++ b/app/src/main/res/drawable/xzsy_bg.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 0a3da84..e5a238d 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -18,11 +18,10 @@ android:background="@drawable/img_home_bg_0" android:orientation="vertical"> - + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="00:00" /> + + + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:layout_marginStart="3dp" /> + android:layout_marginStart="3dp" /> + android:paddingStart="2dp"> + android:textSize="9sp" /> + android:textSize="9sp" /> - + + android:layout_marginStart="47dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_lock.xml b/app/src/main/res/layout/dialog_lock.xml new file mode 100644 index 0000000..81701d1 --- /dev/null +++ b/app/src/main/res/layout/dialog_lock.xml @@ -0,0 +1,38 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_qhbz.xml b/app/src/main/res/layout/dialog_qhbz.xml new file mode 100644 index 0000000..c5bbdbe --- /dev/null +++ b/app/src/main/res/layout/dialog_qhbz.xml @@ -0,0 +1,31 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_removeapp.xml b/app/src/main/res/layout/dialog_removeapp.xml new file mode 100644 index 0000000..d438675 --- /dev/null +++ b/app/src/main/res/layout/dialog_removeapp.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_yw_apps.xml b/app/src/main/res/layout/dialog_yw_apps.xml index eba8f7a..2108dd2 100644 --- a/app/src/main/res/layout/dialog_yw_apps.xml +++ b/app/src/main/res/layout/dialog_yw_apps.xml @@ -31,7 +31,7 @@ android:id="@+id/ll_gb" android:layout_width="25dp" android:layout_height="match_parent" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:gravity="center"> \ No newline at end of file diff --git a/app/src/main/res/layout/fg_content_book.xml b/app/src/main/res/layout/fg_content_book.xml index 07fed7f..226439f 100644 --- a/app/src/main/res/layout/fg_content_book.xml +++ b/app/src/main/res/layout/fg_content_book.xml @@ -8,26 +8,26 @@ android:id="@+id/iv_book_icon" android:layout_width="61dp" android:layout_height="81dp" - android:layout_marginLeft="12dp" /> + android:layout_marginStart="12dp" /> + android:textSize="9sp" /> @@ -50,6 +50,6 @@ android:layout_marginTop="5dp" android:text="暂无内容" android:textColor="@color/white" - android:textSize="9dp" /> + android:textSize="9sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fg_content_book_list.xml b/app/src/main/res/layout/fg_content_book_list.xml index 8ae968b..6d128a8 100644 --- a/app/src/main/res/layout/fg_content_book_list.xml +++ b/app/src/main/res/layout/fg_content_book_list.xml @@ -8,39 +8,39 @@ android:id="@+id/iv_book_icon" android:layout_width="61dp" android:layout_height="81dp" - android:layout_marginLeft="9dp" /> + android:layout_marginStart="9dp" /> + android:layout_marginStart="9dp" + android:layout_toEndOf="@+id/iv_book_icon" /> + android:layout_marginStart="9dp" + android:layout_toEndOf="@+id/iv_book_icon1" /> + android:layout_toEndOf="@+id/iv_book_icon" /> + android:layout_toEndOf="@+id/iv_book_icon1" /> + android:textSize="9sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fg_content_ddyfz.xml b/app/src/main/res/layout/fg_content_ddyfz.xml index 4c4ac56..62c14fa 100644 --- a/app/src/main/res/layout/fg_content_ddyfz.xml +++ b/app/src/main/res/layout/fg_content_ddyfz.xml @@ -31,7 +31,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,10 +153,10 @@ + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|道德与法治" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|道德与法治" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -400,7 +400,7 @@ @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|地理" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|地理" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|化学" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|化学" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> diff --git a/app/src/main/res/layout/fg_content_kx.xml b/app/src/main/res/layout/fg_content_kx.xml index 4dd0bc3..68be86e 100644 --- a/app/src/main/res/layout/fg_content_kx.xml +++ b/app/src/main/res/layout/fg_content_kx.xml @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|科学" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|科学" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|历史" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|历史" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|生物" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|生物" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> diff --git a/app/src/main/res/layout/fg_content_wl.xml b/app/src/main/res/layout/fg_content_wl.xml index bd55a91..0f0b126 100644 --- a/app/src/main/res/layout/fg_content_wl.xml +++ b/app/src/main/res/layout/fg_content_wl.xml @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|物理" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|物理" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> diff --git a/app/src/main/res/layout/fg_content_zz.xml b/app/src/main/res/layout/fg_content_zz.xml index e427361..5394a8f 100644 --- a/app/src/main/res/layout/fg_content_zz.xml +++ b/app/src/main/res/layout/fg_content_zz.xml @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ @@ -130,7 +130,7 @@ @@ -153,7 +153,7 @@ @@ -183,7 +183,7 @@ @@ -213,7 +213,7 @@ @@ -243,7 +243,7 @@ @@ -253,7 +253,7 @@ @@ -273,7 +273,7 @@ android:id="@+id/iv_brdzj" android:layout_width="147dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_wl_brdzj" android:onClick="onGoJzx" android:tag="5|政治" /> @@ -283,7 +283,7 @@ android:layout_width="162dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_wl_aijdc" android:onClick="onGoJzx" android:tag="1|政治" /> @@ -293,10 +293,10 @@ android:layout_width="162dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="9dp"> + android:paddingStart="9dp"> @@ -87,8 +87,8 @@ android:layout_width="72dp" android:layout_height="63dp" android:layout_below="@+id/iv_aizjx" - android:layout_marginLeft="12dp" - android:layout_toRightOf="@+id/iv_zwpg" + android:layout_marginStart="12dp" + android:layout_toEndOf="@+id/iv_zwpg" android:background="@drawable/icon_ai_zndy" android:onClick="onClick" android:tag="@string/tag_args_new_zndy" /> diff --git a/app/src/main/res/layout/fragment_chinese.xml b/app/src/main/res/layout/fragment_chinese.xml index 4d63e60..4175edb 100644 --- a/app/src/main/res/layout/fragment_chinese.xml +++ b/app/src/main/res/layout/fragment_chinese.xml @@ -126,20 +126,20 @@ + android:paddingStart="7dp"> @@ -168,7 +168,7 @@ @@ -195,7 +195,7 @@ @@ -213,7 +213,7 @@ @@ -236,7 +236,7 @@ @@ -266,7 +266,7 @@ @@ -296,7 +296,7 @@ @@ -326,7 +326,7 @@ @@ -336,7 +336,7 @@ @@ -356,7 +356,7 @@ android:id="@+id/iv_brdzj" android:layout_width="168dp" android:layout_height="237dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_yw_brdzj" android:onClick="onGoJzx" android:tag="5|语文" /> @@ -366,7 +366,7 @@ android:layout_width="168dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_yw_aijdc" android:onClick="onGoJzx" android:tag="1|语文" /> @@ -376,10 +376,10 @@ android:layout_width="168dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="12dp"> + android:paddingStart="12dp"> @@ -529,7 +529,7 @@ diff --git a/app/src/main/res/layout/fragment_complex.xml b/app/src/main/res/layout/fragment_complex.xml index c3e59db..362c130 100644 --- a/app/src/main/res/layout/fragment_complex.xml +++ b/app/src/main/res/layout/fragment_complex.xml @@ -63,7 +63,7 @@ android:layout_width="106dp" android:layout_height="94dp" android:layout_alignParentBottom="true" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginBottom="12dp" android:background="@drawable/icon_xk_ddyfz_tbsp" android:onClick="onClick" @@ -74,9 +74,9 @@ android:layout_width="106dp" android:layout_height="94dp" android:layout_alignParentBottom="true" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_zz_tbsp" + android:layout_toEndOf="@+id/iv_zz_tbsp" android:background="@drawable/icon_xk_ddyfz_tbfd" android:onClick="onClick" android:tag="@string/tag_args_new_tbfd_zz" /> @@ -85,8 +85,8 @@ @@ -95,7 +95,7 @@ android:id="@+id/kxtbkt" android:layout_width="81dp" android:layout_height="94dp" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:background="@drawable/icon_xk_kx_tbsp" android:onClick="onClick" android:tag="@string/tag_args_new_xksp_kx" /> @@ -104,8 +104,8 @@ android:id="@+id/kxtbfd" android:layout_width="81dp" android:layout_height="94dp" - android:layout_marginLeft="12dp" - android:layout_toRightOf="@+id/kxtbkt" + android:layout_marginStart="12dp" + android:layout_toEndOf="@+id/kxtbkt" android:background="@drawable/icon_xk_kx_tbfd" android:onClick="onClick" android:tag="@string/tag_args_new_tbfd_kx" /> @@ -113,8 +113,8 @@ diff --git a/app/src/main/res/layout/fragment_english.xml b/app/src/main/res/layout/fragment_english.xml index 3e1a49c..afab1a5 100644 --- a/app/src/main/res/layout/fragment_english.xml +++ b/app/src/main/res/layout/fragment_english.xml @@ -53,7 +53,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:paddingStart="8dp"> @@ -169,7 +169,7 @@ @@ -195,7 +195,7 @@ @@ -213,7 +213,7 @@ @@ -236,10 +236,10 @@ + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -356,7 +356,7 @@ android:id="@+id/iv_brdzj" android:layout_width="169dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_yw_brdzj" android:onClick="onGoJzx" android:tag="5|英语" /> @@ -366,7 +366,7 @@ android:layout_width="169dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_yw_aijdc" android:onClick="onGoJzx" android:tag="1|英语" /> @@ -376,10 +376,10 @@ android:layout_width="169dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="12dp"> + android:paddingStart="12dp"> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -482,7 +482,7 @@ @@ -526,9 +526,9 @@ android:id="@+id/rl_apps" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:onClick="@{click::openAppsDialog}" android:orientation="vertical"> @@ -538,12 +538,12 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> diff --git a/app/src/main/res/layout/fragment_math.xml b/app/src/main/res/layout/fragment_math.xml index e2098ee..0b8622a 100644 --- a/app/src/main/res/layout/fragment_math.xml +++ b/app/src/main/res/layout/fragment_math.xml @@ -127,7 +127,7 @@ android:layout_width="150dp" android:layout_height="238dp" android:layout_alignParentBottom="true" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:background="@drawable/icon_sx_tbfd_bg" android:onClick="onClick" android:tag="@string/tag_args_new_tbfd_sx" /> @@ -135,7 +135,7 @@ @@ -153,7 +153,7 @@ @@ -176,7 +176,7 @@ @@ -206,7 +206,7 @@ @@ -236,7 +236,7 @@ @@ -266,7 +266,7 @@ @@ -276,7 +276,7 @@ @@ -296,7 +296,7 @@ android:id="@+id/iv_brdzj" android:layout_width="169dp" android:layout_height="238dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:background="@drawable/icon_yw_brdzj" android:onClick="onGoJzx" android:tag="5|数学" /> @@ -306,7 +306,7 @@ android:layout_width="169dp" android:layout_height="125dp" android:layout_marginBottom="12dp" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/icon_yw_aijdc" android:onClick="onGoJzx" android:tag="1|数学" /> @@ -316,10 +316,10 @@ android:layout_width="169dp" android:layout_height="100dp" android:layout_below="@+id/iv_aijdc" - android:layout_toRightOf="@+id/iv_brdzj" + android:layout_toEndOf="@+id/iv_brdzj" android:background="@drawable/bg_shape_b6f3fa_40" android:orientation="vertical" - android:paddingLeft="12dp"> + android:paddingStart="12dp"> @@ -469,7 +469,7 @@ diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 69bc3c0..03bd63a 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toRightOf="@+id/head_image" + android:layout_toEndOf="@+id/head_image" android:onClick="onClick" android:orientation="vertical" android:tag="@string/tag_args_xxgrzx"> @@ -125,8 +125,8 @@ android:id="@+id/ll_dj" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="53dp" - android:layout_toRightOf="@+id/ll_grxx" + android:layout_marginStart="53dp" + android:layout_toEndOf="@+id/ll_grxx" android:gravity="center" android:orientation="vertical"> @@ -154,14 +154,14 @@ android:id="@+id/iv_x2" android:layout_width="9dp" android:layout_height="9dp" - android:layout_marginLeft="2dp" + android:layout_marginStart="2dp" android:background="@drawable/icon_wd_wjx_pre" /> @@ -179,7 +179,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" android:gravity="center_vertical" android:orientation="horizontal"> @@ -197,7 +197,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginLeft="5dp" + android:layout_marginStart="5dp" android:text="不积小流，无以成江河" android:textColor="#b3b1ca" android:textSize="9dp" /> @@ -207,24 +207,24 @@ android:id="@+id/rl_dk" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="9dp" - android:layout_marginRight="12dp" /> + android:layout_marginEnd="12dp" /> + android:layout_marginStart="19dp" /> + android:paddingStart="12dp"> @@ -355,9 +355,9 @@ android:layout_width="97dp" android:layout_height="72dp" android:layout_below="@+id/iv_scb" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" - android:layout_toRightOf="@+id/ll_ctb" + android:layout_toEndOf="@+id/ll_ctb" android:background="@drawable/icon_wd_xwcd" android:onClick="onClick" android:tag="@string/tag_args_new_xwcd_online" /> diff --git a/app/src/main/res/layout/fragment_read.xml b/app/src/main/res/layout/fragment_read.xml index e0e5c90..3eddfa3 100644 --- a/app/src/main/res/layout/fragment_read.xml +++ b/app/src/main/res/layout/fragment_read.xml @@ -38,7 +38,7 @@ @@ -72,9 +72,9 @@ @@ -88,7 +88,7 @@ android:id="@+id/iv_shu1" android:layout_width="62dp" android:layout_height="82dp" - android:layout_marginLeft="28dp" + android:layout_marginStart="28dp" android:background="@drawable/icon_ds_shu1" android:onClick="onClick" android:tag="@string/tag_args_new_zhtsg_tjkd" /> @@ -97,8 +97,8 @@ android:id="@+id/iv_shu2" android:layout_width="62dp" android:layout_height="82dp" - android:layout_marginLeft="19dp" - android:layout_toRightOf="@+id/iv_shu1" + android:layout_marginStart="19dp" + android:layout_toEndOf="@+id/iv_shu1" android:background="@drawable/icon_ds_shu2" android:onClick="onClick" android:tag="@string/tag_args_new_zhtsg_adjy" /> @@ -107,8 +107,8 @@ android:id="@+id/iv_shu3" android:layout_width="62dp" android:layout_height="82dp" - android:layout_marginLeft="19dp" - android:layout_toRightOf="@+id/iv_shu2" + android:layout_marginStart="19dp" + android:layout_toEndOf="@+id/iv_shu2" android:background="@drawable/icon_ds_shu3" android:onClick="onClick" android:tag="@string/tag_args_new_zhtsg_tmssdxw" /> @@ -117,8 +117,8 @@ android:id="@+id/iv_shu4" android:layout_width="62dp" android:layout_height="82dp" - android:layout_marginLeft="19dp" - android:layout_toRightOf="@+id/iv_shu3" + android:layout_marginStart="19dp" + android:layout_toEndOf="@+id/iv_shu3" android:background="@drawable/icon_ds_shu4" android:onClick="onClick" android:tag="@string/tag_args_new_zhtsg_lryh" /> @@ -127,8 +127,8 @@ android:id="@+id/iv_shu5" android:layout_width="62dp" android:layout_height="82dp" - android:layout_marginLeft="19dp" - android:layout_toRightOf="@+id/iv_shu4" + android:layout_marginStart="19dp" + android:layout_toEndOf="@+id/iv_shu4" android:background="@drawable/icon_ds_shu5" android:onClick="onClick" android:tag="@string/tag_args_new_zhtsg_xwz" /> @@ -136,8 +136,8 @@ @@ -160,7 +160,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" android:text="最近阅读" android:textColor="@color/white" @@ -183,15 +183,15 @@ @@ -75,7 +75,7 @@ @@ -83,7 +83,7 @@ @@ -94,9 +94,9 @@ android:id="@+id/rela_root" android:layout_width="wrap_content" android:layout_height="162dp" - android:layout_marginLeft="25dp" + android:layout_marginStart="25dp" android:layout_marginTop="6dp" - android:layout_marginRight="25dp"> + android:layout_marginEnd="25dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_banner.xml b/app/src/main/res/layout/item_banner.xml index b0ec9f9..8007ef0 100644 --- a/app/src/main/res/layout/item_banner.xml +++ b/app/src/main/res/layout/item_banner.xml @@ -13,7 +13,7 @@ android:id="@+id/fdzy" android:layout_width="111dp" android:layout_height="94dp" - android:layout_marginLeft="28dp" + android:layout_marginStart="28dp" android:layout_marginTop="93dp" android:background="@drawable/icon_ai_fdzy" android:onClick="onClick" @@ -22,11 +22,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_chart.xml b/app/src/main/res/layout/item_chart.xml index e841924..dc436c4 100644 --- a/app/src/main/res/layout/item_chart.xml +++ b/app/src/main/res/layout/item_chart.xml @@ -10,8 +10,8 @@ android:id="@+id/battery_pb" android:layout_width="16dp" android:layout_height="56dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" /> + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml index 009505a..596d6cb 100644 --- a/app/src/main/res/layout/item_task.xml +++ b/app/src/main/res/layout/item_task.xml @@ -30,7 +30,7 @@ android:id="@+id/tv_exp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="3dp" + android:layout_marginStart="3dp" android:includeFontPadding="false" android:text="0" android:textColor="@color/white" @@ -41,7 +41,7 @@ android:id="@+id/iv_qwc" android:layout_width="106dp" android:layout_height="50dp" - android:layout_marginLeft="50dp" + android:layout_marginStart="50dp" android:background="@drawable/bg_shape_qwc" android:gravity="center" android:text="去完成" @@ -53,7 +53,7 @@ android:id="@+id/iv_lq" android:layout_width="106dp" android:layout_height="50dp" - android:layout_marginLeft="50dp" + android:layout_marginStart="50dp" android:background="@drawable/bg_shape_lq" android:gravity="center" android:text="领取" @@ -65,7 +65,7 @@ android:id="@+id/iv_ywc" android:layout_width="106dp" android:layout_height="50dp" - android:layout_marginLeft="50dp" + android:layout_marginStart="50dp" android:background="@drawable/bg_shape_ywc" android:gravity="center" android:text="已完成" diff --git a/app/src/main/res/layout/layout_daily_tasks.xml b/app/src/main/res/layout/layout_daily_tasks.xml index fa44bdc..e5805eb 100644 --- a/app/src/main/res/layout/layout_daily_tasks.xml +++ b/app/src/main/res/layout/layout_daily_tasks.xml @@ -14,7 +14,7 @@ android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" android:gravity="center_vertical" android:orientation="horizontal"> @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginLeft="5dp" + android:layout_marginStart="5dp" android:text="不积蛙步，无以至千里" android:textColor="#b3b1ca" android:textSize="9dp" /> @@ -42,7 +42,7 @@ android:id="@+id/rl_rw" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="40dp" /> diff --git a/app/src/main/res/layout/layout_jiesao.xml b/app/src/main/res/layout/layout_jiesao.xml index 57853b9..763342b 100644 --- a/app/src/main/res/layout/layout_jiesao.xml +++ b/app/src/main/res/layout/layout_jiesao.xml @@ -10,10 +10,10 @@ android:layout_width="225dp" android:layout_height="245dp" android:layout_above="@+id/ll_progress" - android:layout_marginLeft="9dp" + android:layout_marginStart="9dp" android:background="@drawable/icon_dia_ds_bg" android:orientation="vertical" - android:paddingLeft="10dp" + android:paddingStart="10dp" android:paddingTop="6dp"> @@ -141,9 +141,9 @@ diff --git a/app/src/main/res/layout/layout_jzstd_notitle.xml b/app/src/main/res/layout/layout_jzstd_notitle.xml index c7e690a..f24ec09 100644 --- a/app/src/main/res/layout/layout_jzstd_notitle.xml +++ b/app/src/main/res/layout/layout_jzstd_notitle.xml @@ -38,7 +38,7 @@ android:id="@+id/fullscreen" android:layout_width="52.5dp" android:layout_height="fill_parent" - android:paddingLeft="14dp" + android:paddingStart="14dp" android:paddingRight="14dp" android:scaleType="centerInside" android:src="@drawable/jz_enlarge" /> @@ -131,7 +131,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:background="@drawable/jz_retry" - android:paddingLeft="9dp" + android:paddingStart="9dp" android:paddingTop="4dp" android:paddingRight="9dp" android:paddingBottom="4dp" diff --git a/app/src/main/res/layout/layout_tree.xml b/app/src/main/res/layout/layout_tree.xml index 7c445a7..7f10467 100644 --- a/app/src/main/res/layout/layout_tree.xml +++ b/app/src/main/res/layout/layout_tree.xml @@ -22,7 +22,7 @@ android:id="@+id/ll_xljt" android:layout_width="121dp" android:layout_height="40dp" - android:layout_marginLeft="116dp" + android:layout_marginStart="116dp" android:background="@drawable/icon_ds_xljt" android:gravity="center_horizontal" android:visibility="gone"> @@ -31,8 +31,8 @@ android:id="@+id/tv_xljt" android:layout_width="wrap_content" android:layout_height="30dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:lineSpacingExtra="2dp" android:paddingTop="2dp" @@ -45,9 +45,9 @@ android:id="@+id/rl_sh" android:layout_width="wrap_content" android:layout_height="97dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - android:layout_marginRight="6dp"> + android:layout_marginEnd="6dp"> + android:layout_marginEnd="11dp"> @@ -17,9 +17,9 @@